diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-20 14:10:05 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-20 14:10:05 -0400 |
| commit | faf334d94e8c7450962b6b0d18fe57cefd43f04a (patch) | |
| tree | bac12a41585561e84b914ede37bcd83a62764fb9 /docs/tutorials/wiki/src/tests | |
| parent | 53e00ae36d969e8f8794549d66f9b1c6b92e0c60 (diff) | |
| parent | 4d2fc0bbc58bc1948c73b2fcb3e0e1bdeee7a5d6 (diff) | |
| download | pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.gz pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.bz2 pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.zip | |
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'docs/tutorials/wiki/src/tests')
| -rw-r--r-- | docs/tutorials/wiki/src/tests/setup.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki/src/tests/tutorial/__init__.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py index 5ff7b545c..2e7ed2398 100644 --- a/docs/tutorials/wiki/src/tests/setup.py +++ b/docs/tutorials/wiki/src/tests/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/tests/tutorial/__init__.py b/docs/tutorials/wiki/src/tests/tutorial/__init__.py index 8ea8f8fa3..bd3c5619f 100644 --- a/docs/tutorials/wiki/src/tests/tutorial/__init__.py +++ b/docs/tutorials/wiki/src/tests/tutorial/__init__.py @@ -19,6 +19,7 @@ def main(global_config, **settings): 'sosecret', callback=groupfinder, hashalg='sha512') authz_policy = ACLAuthorizationPolicy() config = Configurator(root_factory=root_factory, settings=settings) + config.include('pyramid_chameleon') config.set_authentication_policy(authn_policy) config.set_authorization_policy(authz_policy) config.add_static_view('static', 'static', cache_max_age=3600) |