diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-29 13:36:07 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-29 13:36:07 -0500 |
| commit | bfe8046689b9f9b4273df773a43be19080958193 (patch) | |
| tree | 1fa043841e64fb861919febbcdfb94ea05fe1f4c /docs/tutorials/wiki2/src | |
| parent | 76363823a22a709a15b6895430b4eece67da3b39 (diff) | |
| parent | 71c94c0ae7a36dab1b39585907d8a0c24d377c90 (diff) | |
| download | pyramid-bfe8046689b9f9b4273df773a43be19080958193.tar.gz pyramid-bfe8046689b9f9b4273df773a43be19080958193.tar.bz2 pyramid-bfe8046689b9f9b4273df773a43be19080958193.zip | |
Merge branch '1.3-branch'
Diffstat (limited to 'docs/tutorials/wiki2/src')
| -rw-r--r-- | docs/tutorials/wiki2/src/authorization/tutorial/__init__.py | 6 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/src/tests/tutorial/__init__.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py index 04dd5fe82..7e290a1e1 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py @@ -17,9 +17,9 @@ def main(global_config, **settings): 'sosecret', callback=groupfinder) authz_policy = ACLAuthorizationPolicy() config = Configurator(settings=settings, - root_factory='tutorial.models.RootFactory', - authentication_policy=authn_policy, - authorization_policy=authz_policy) + root_factory='tutorial.models.RootFactory') + config.set_authentication_policy(authn_policy) + config.set_authorization_policy(authz_policy) config.add_static_view('static', 'static', cache_max_age=3600) config.add_route('view_wiki', '/') config.add_route('login', '/login') diff --git a/docs/tutorials/wiki2/src/tests/tutorial/__init__.py b/docs/tutorials/wiki2/src/tests/tutorial/__init__.py index 04dd5fe82..7e290a1e1 100644 --- a/docs/tutorials/wiki2/src/tests/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/tests/tutorial/__init__.py @@ -17,9 +17,9 @@ def main(global_config, **settings): 'sosecret', callback=groupfinder) authz_policy = ACLAuthorizationPolicy() config = Configurator(settings=settings, - root_factory='tutorial.models.RootFactory', - authentication_policy=authn_policy, - authorization_policy=authz_policy) + root_factory='tutorial.models.RootFactory') + config.set_authentication_policy(authn_policy) + config.set_authorization_policy(authz_policy) config.add_static_view('static', 'static', cache_max_age=3600) config.add_route('view_wiki', '/') config.add_route('login', '/login') |