summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/src/views
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-09-06 00:02:46 -0500
committerMichael Merickel <michael@merickel.org>2013-09-06 00:22:24 -0500
commit404b28ba2efb02d93777a3e01fd602c96af8c077 (patch)
treeb7a29799cd95b209dde60f903ac42bb5865cf1d4 /docs/tutorials/wiki/src/views
parentac681bc83778443bcb70b9c1ea370368044614fb (diff)
downloadpyramid-404b28ba2efb02d93777a3e01fd602c96af8c077.tar.gz
pyramid-404b28ba2efb02d93777a3e01fd602c96af8c077.tar.bz2
pyramid-404b28ba2efb02d93777a3e01fd602c96af8c077.zip
update the code in the wiki and wiki2 tutorials to use pyramid_chameleon
Diffstat (limited to 'docs/tutorials/wiki/src/views')
-rw-r--r--docs/tutorials/wiki/src/views/setup.py1
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/__init__.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/tutorials/wiki/src/views/setup.py b/docs/tutorials/wiki/src/views/setup.py
index 5d87fedbf..5ab4f73cd 100644
--- a/docs/tutorials/wiki/src/views/setup.py
+++ b/docs/tutorials/wiki/src/views/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/views/tutorial/__init__.py b/docs/tutorials/wiki/src/views/tutorial/__init__.py
index c3bb87a62..f2a86df47 100644
--- a/docs/tutorials/wiki/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki/src/views/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()