summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/authorization
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-04-22 13:42:19 -0400
committerChris McDonough <chrism@plope.com>2011-04-22 13:42:19 -0400
commited7ffe0e2065100f551793b3774656d8bdde0fb0 (patch)
tree53637b76d148774c5a7c3b9e103373e33e6c2f9e /docs/tutorials/wiki2/src/authorization
parentc150d77248653172b487326a1059b8c0bc5056e4 (diff)
downloadpyramid-ed7ffe0e2065100f551793b3774656d8bdde0fb0.tar.gz
pyramid-ed7ffe0e2065100f551793b3774656d8bdde0fb0.tar.bz2
pyramid-ed7ffe0e2065100f551793b3774656d8bdde0fb0.zip
- Make sure deprecation warnings aren't raised when tests are run.
- Modify documentation for cross-referencing. - Use add_view(viewname) syntax rather than add_view(view=viewname) syntax for normalization. - Use warnings.warn rather than zope.deprecated in order to make testing easier. - Move tests which test deprecated methods of configurator to a separate test case.
Diffstat (limited to 'docs/tutorials/wiki2/src/authorization')
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/__init__.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
index 7da99775c..e8baa568c 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
@@ -29,14 +29,14 @@ def main(global_config, **settings):
config.add_route('edit_page', '/{pagename}/edit_page')
config.add_route('view_wiki', '/')
- config.add_view(route_name='login', view='tutorial.login.login',
+ config.add_view('tutorial.login.login', route_name='login',
renderer='tutorial:templates/login.pt')
- config.add_view(route_name='logout', view='tutorial.login.logout')
- config.add_view(route_name='view_page', view='tutorial.views.view_page',
+ config.add_view('tutorial.login.logout', route_name='logout')
+ config.add_view('tutorial.views.view_page', route_name='view_page',
renderer='tutorial:templates/view.pt')
- config.add_view(route_name='add_page', view='tutorial.views.add_page',
+ config.add_view('tutorial.views.add_page', route_name='add_page',
renderer='tutorial:templates/edit.pt', permission='edit')
- config.add_view(route_name='edit_page', view='tutorial.views.edit_page',
+ config.add_view('tutorial.views.edit_page', route_name='edit_page',
renderer='tutorial:templates/edit.pt', permission='edit')
config.add_view('tutorial.login.login',
context='pyramid.exceptions.Forbidden',