From 676ae0202d9c55379837abb3436e9470003a17fa Mon Sep 17 00:00:00 2001 From: Hannah Krager Date: Sat, 22 Oct 2016 12:02:32 -0400 Subject: [PATCH 1/5] move from chameleon to jinja2 for starter scaffold --- pyramid/scaffolds/starter/+package+/__init__.py | 2 +- .../{mytemplate.pt_tmpl => layout.jinja2_tmpl} | 13 ++++++------- .../+package+/templates/mytemplate.jinja2_tmpl | 8 ++++++++ pyramid/scaffolds/starter/+package+/views.py_tmpl | 2 +- pyramid/scaffolds/starter/setup.py_tmpl | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) rename pyramid/scaffolds/starter/+package+/templates/{mytemplate.pt_tmpl => layout.jinja2_tmpl} (79%) create mode 100644 pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl diff --git a/pyramid/scaffolds/starter/+package+/__init__.py b/pyramid/scaffolds/starter/+package+/__init__.py index ad5ecbc6f1..49dde36d4d 100644 --- a/pyramid/scaffolds/starter/+package+/__init__.py +++ b/pyramid/scaffolds/starter/+package+/__init__.py @@ -5,7 +5,7 @@ def main(global_config, **settings): """ This function returns a Pyramid WSGI application. """ config = Configurator(settings=settings) - config.include('pyramid_chameleon') + config.include('pyramid_jinja2') config.add_static_view('static', 'static', cache_max_age=3600) config.add_route('home', '/') config.scan() diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl similarity index 79% rename from pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl rename to pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl index 87fae38170..3608556026 100644 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + - +