diff options
| author | Chris McDonough <chrism@plope.com> | 2011-04-22 13:45:13 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-04-22 13:45:13 -0400 |
| commit | 1440e9828fcd527ff79de0655ee65d3076f13911 (patch) | |
| tree | 53637b76d148774c5a7c3b9e103373e33e6c2f9e /docs/tutorials/wiki2/src/views | |
| parent | feef5257261f3c37f11571a475dbd68f603b144e (diff) | |
| parent | ed7ffe0e2065100f551793b3774656d8bdde0fb0 (diff) | |
| download | pyramid-1440e9828fcd527ff79de0655ee65d3076f13911.tar.gz pyramid-1440e9828fcd527ff79de0655ee65d3076f13911.tar.bz2 pyramid-1440e9828fcd527ff79de0655ee65d3076f13911.zip | |
Merge branch 'mmerickel-disambiguate_add_route'
Diffstat (limited to 'docs/tutorials/wiki2/src/views')
| -rw-r--r-- | docs/tutorials/wiki2/src/views/tutorial/__init__.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py index 1a8d24499..ad89c124e 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py @@ -10,15 +10,16 @@ def main(global_config, **settings): initialize_sql(engine) config = Configurator(settings=settings) config.add_static_view('static', 'tutorial:static') - config.add_route('view_wiki', '/', view='tutorial.views.view_wiki') - config.add_route('view_page', '/{pagename}', - view='tutorial.views.view_page', - view_renderer='tutorial:templates/view.pt') - config.add_route('add_page', '/add_page/{pagename}', - view='tutorial.views.add_page', - view_renderer='tutorial:templates/edit.pt') - config.add_route('edit_page', '/{pagename}/edit_page', - view='tutorial.views.edit_page', - view_renderer='tutorial:templates/edit.pt') + config.add_route('view_wiki', '/') + config.add_route('view_page', '/{pagename}') + config.add_route('add_page', '/add_page/{pagename}') + config.add_route('edit_page', '/{pagename}/edit_page') + config.add_view('tutorial.views.view_wiki', route_name='view_wiki') + config.add_view('tutorial.views.view_page', route_name='view_page', + renderer='tutorial:templates/view.pt') + config.add_view('tutorial.views.add_page', route_name='add_page', + renderer='tutorial:templates/edit.pt') + config.add_view('tutorial.views.edit_page', route_name='edit_page', + renderer='tutorial:templates/edit.pt') return config.make_wsgi_app() |