summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/authorization
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/wiki2/src/authorization
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/wiki2/src/authorization')
-rw-r--r--docs/tutorials/wiki2/src/authorization/setup.py5
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/__init__.py1
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/src/authorization/setup.py b/docs/tutorials/wiki2/src/authorization/setup.py
index e8fa8f396..09bd63d33 100644
--- a/docs/tutorials/wiki2/src/authorization/setup.py
+++ b/docs/tutorials/wiki2/src/authorization/setup.py
@@ -10,10 +10,11 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
requires = [
'pyramid',
+ 'pyramid_chameleon',
+ 'pyramid_debugtoolbar',
+ 'pyramid_tm',
'SQLAlchemy',
'transaction',
- 'pyramid_tm',
- 'pyramid_debugtoolbar',
'zope.sqlalchemy',
'waitress',
'docutils',
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
index d08e55bf9..2ada42171 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
@@ -25,6 +25,7 @@ def main(global_config, **settings):
root_factory='tutorial.models.RootFactory')
config.set_authentication_policy(authn_policy)
config.set_authorization_policy(authz_policy)
+ config.include('pyramid_chameleon')
config.add_static_view('static', 'static', cache_max_age=3600)
config.add_route('view_wiki', '/')
config.add_route('login', '/login')