From b7b18463b80b9f16d603264c3b1b661061f492e6 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 13 Dec 2016 12:42:00 -0800 Subject: revert commits for ZODB scaffold changes --- pyramid/scaffolds/zodb/+package+/__init__.py | 2 +- .../zodb/+package+/templates/layout.jinja2_tmpl | 66 --------------------- .../+package+/templates/mytemplate.jinja2_tmpl | 7 --- .../zodb/+package+/templates/mytemplate.pt_tmpl | 67 ++++++++++++++++++++++ pyramid/scaffolds/zodb/+package+/views.py_tmpl | 2 +- pyramid/scaffolds/zodb/MANIFEST.in_tmpl | 2 +- pyramid/scaffolds/zodb/setup.py_tmpl | 2 +- 7 files changed, 71 insertions(+), 77 deletions(-) delete mode 100644 pyramid/scaffolds/zodb/+package+/templates/layout.jinja2_tmpl delete mode 100644 pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl create mode 100644 pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl diff --git a/pyramid/scaffolds/zodb/+package+/__init__.py b/pyramid/scaffolds/zodb/+package+/__init__.py index 0ca5198b6..f2a86df47 100644 --- a/pyramid/scaffolds/zodb/+package+/__init__.py +++ b/pyramid/scaffolds/zodb/+package+/__init__.py @@ -12,7 +12,7 @@ def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ config = Configurator(root_factory=root_factory, settings=settings) - config.include('pyramid_jinja2') + config.include('pyramid_chameleon') config.add_static_view('static', 'static', cache_max_age=3600) config.scan() return config.make_wsgi_app() diff --git a/pyramid/scaffolds/zodb/+package+/templates/layout.jinja2_tmpl b/pyramid/scaffolds/zodb/+package+/templates/layout.jinja2_tmpl deleted file mode 100644 index a0b3f22f4..000000000 --- a/pyramid/scaffolds/zodb/+package+/templates/layout.jinja2_tmpl +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - ZODB Scaffold for The Pyramid Web Framework - - - - - - - - - - - - - -
-
-
-
- -
-
- {% block content %} -

No content

- {% endblock content %} -
-
-
-
- -
-
-
-
- Copyright © Pylons Project -
-
-
-
- - - - - - - - diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl deleted file mode 100644 index bb075e91d..000000000 --- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "layout.jinja2" %} -{% block content %} -
-

Pyramid ZODB scaffold

-

Welcome to \{\{project\}\}, an application generated by
the Pyramid Web Framework {{pyramid_version}}.

-
-{% endblock content %} diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl new file mode 100644 index 000000000..e109ab829 --- /dev/null +++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl @@ -0,0 +1,67 @@ + + + + + + + + + + + ZODB Scaffold for The Pyramid Web Framework + + + + + + + + + + + + + +
+
+
+
+ +
+
+
+

Pyramid ZODB scaffold

+

Welcome to ${project}, an application generated by
the Pyramid Web Framework {{pyramid_version}}.

+
+
+
+
+
+ +
+
+
+
+ Copyright © Pylons Project +
+
+
+
+ + + + + + + + diff --git a/pyramid/scaffolds/zodb/+package+/views.py_tmpl b/pyramid/scaffolds/zodb/+package+/views.py_tmpl index 0b176b365..1e8a9b65a 100644 --- a/pyramid/scaffolds/zodb/+package+/views.py_tmpl +++ b/pyramid/scaffolds/zodb/+package+/views.py_tmpl @@ -2,6 +2,6 @@ from pyramid.view import view_config from .models import MyModel -@view_config(context=MyModel, renderer='templates/mytemplate.jinja2') +@view_config(context=MyModel, renderer='templates/mytemplate.pt') def my_view(request): return {'project': '{{project}}'} diff --git a/pyramid/scaffolds/zodb/MANIFEST.in_tmpl b/pyramid/scaffolds/zodb/MANIFEST.in_tmpl index 4d1c86b44..0ff6eb7a0 100644 --- a/pyramid/scaffolds/zodb/MANIFEST.in_tmpl +++ b/pyramid/scaffolds/zodb/MANIFEST.in_tmpl @@ -1,2 +1,2 @@ include *.txt *.ini *.cfg *.rst -recursive-include {{package}} *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2 +recursive-include {{package}} *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl index a503d60ab..19771d756 100644 --- a/pyramid/scaffolds/zodb/setup.py_tmpl +++ b/pyramid/scaffolds/zodb/setup.py_tmpl @@ -10,7 +10,7 @@ with open(os.path.join(here, 'CHANGES.txt')) as f: requires = [ 'pyramid', - 'pyramid_jinja2', + 'pyramid_chameleon', 'pyramid_debugtoolbar', 'pyramid_tm', 'pyramid_zodbconn', -- cgit v1.2.3