diff options
| author | Chris McDonough <chrism@plope.com> | 2011-04-22 10:21:30 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-04-22 10:21:30 -0400 |
| commit | c150d77248653172b487326a1059b8c0bc5056e4 (patch) | |
| tree | 48b508a5e7047bc8d9ff77defaf82af87bdb2ec8 /docs/tutorials/wiki2/src/views | |
| parent | feef5257261f3c37f11571a475dbd68f603b144e (diff) | |
| parent | 1612fe799b5d36d3c7c39468be55b15777730f62 (diff) | |
| download | pyramid-c150d77248653172b487326a1059b8c0bc5056e4.tar.gz pyramid-c150d77248653172b487326a1059b8c0bc5056e4.tar.bz2 pyramid-c150d77248653172b487326a1059b8c0bc5056e4.zip | |
Merge branch 'disambiguate_add_route' of https://github.com/mmerickel/pyramid into 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..93abf83e7 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(route_name='view_wiki', view='tutorial.views.view_wiki') + config.add_view(route_name='view_page', view='tutorial.views.view_page', + renderer='tutorial:templates/view.pt') + config.add_view(route_name='add_page', view='tutorial.views.add_page', + renderer='tutorial:templates/edit.pt') + config.add_view(route_name='edit_page', view='tutorial.views.edit_page', + renderer='tutorial:templates/edit.pt') return config.make_wsgi_app() |