From 84f8a58a61c36a91b4625ea14fdf998b95c30829 Mon Sep 17 00:00:00 2001 From: Hannah Krager Date: Sat, 22 Oct 2016 12:44:48 -0400 Subject: Move to Jinja2 from chameleon in zodb scaffold --- 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/setup.py_tmpl | 2 +- 6 files changed, 76 insertions(+), 70 deletions(-) create mode 100644 pyramid/scaffolds/zodb/+package+/templates/layout.jinja2_tmpl create mode 100644 pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl delete 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 f2a86df47..0ca5198b6 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_chameleon') + config.include('pyramid_jinja2') 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 new file mode 100644 index 000000000..a0b3f22f4 --- /dev/null +++ b/pyramid/scaffolds/zodb/+package+/templates/layout.jinja2_tmpl @@ -0,0 +1,66 @@ + + + + + + + + + + + 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 new file mode 100644 index 000000000..34d287b48 --- /dev/null +++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl @@ -0,0 +1,7 @@ +{% extends "layout.jinja2" %} +{% block content %} +
+

Pyramid ZODB scaffold

+

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

+
+{% endblock content %} \ No newline at end of file diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl deleted file mode 100644 index e109ab829..000000000 --- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - 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 1e8a9b65a..0b176b365 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.pt') +@view_config(context=MyModel, renderer='templates/mytemplate.jinja2') def my_view(request): return {'project': '{{project}}'} diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl index 19771d756..a503d60ab 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_chameleon', + 'pyramid_jinja2', 'pyramid_debugtoolbar', 'pyramid_tm', 'pyramid_zodbconn', -- cgit v1.2.3