diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-09 14:14:35 -0400 |
| commit | 7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce (patch) | |
| tree | 227c5b5e5a0b1ee8d8974679b58f29a162b8b2af /docs/tutorials/wiki/src/basiclayout | |
| parent | 7a73e56d4d86d9139fd54a9cd83a68d25bc02df7 (diff) | |
| parent | 26787cf215b9bb6ddc0cce84a777f7c2e3079842 (diff) | |
| download | pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.gz pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.tar.bz2 pyramid-7ef0c25a86431a7f9deb4ed8bbe69cd4c1b4c3ce.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki/src/basiclayout')
| -rw-r--r-- | docs/tutorials/wiki/src/basiclayout/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/tutorials/wiki/src/basiclayout/setup.py b/docs/tutorials/wiki/src/basiclayout/setup.py index 75ba02611..da79881ab 100644 --- a/docs/tutorials/wiki/src/basiclayout/setup.py +++ b/docs/tutorials/wiki/src/basiclayout/setup.py @@ -10,6 +10,7 @@ with open(os.path.join(here, 'CHANGES.txt')) as f: requires = [ 'pyramid', + 'pyramid_chameleon', 'pyramid_zodbconn', 'transaction', 'pyramid_tm', diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py index c3bb87a62..f2a86df47 100644 --- a/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py +++ b/docs/tutorials/wiki/src/basiclayout/tutorial/__init__.py @@ -12,6 +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.add_static_view('static', 'static', cache_max_age=3600) config.scan() return config.make_wsgi_app() |