diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-06-24 05:15:28 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-06-24 05:15:28 +0000 |
| commit | 87268814ece91aa2394feec47d8c95863e041c5a (patch) | |
| tree | c5a7b2c06fe445ce144ca335cb3297e3f1ffc800 /docs/tutorials/bfgwiki2/src/views | |
| parent | dc405b2e9bac8e43350442a7824901f5ced8e3d5 (diff) | |
| download | pyramid-87268814ece91aa2394feec47d8c95863e041c5a.tar.gz pyramid-87268814ece91aa2394feec47d8c95863e041c5a.tar.bz2 pyramid-87268814ece91aa2394feec47d8c95863e041c5a.zip | |
- Use ``repoze.bfg.url.route_url`` API in tutorials rather than Routes
``url_for`` API.
Diffstat (limited to 'docs/tutorials/bfgwiki2/src/views')
| -rw-r--r-- | docs/tutorials/bfgwiki2/src/views/tutorial/views.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py index f81fbf2af..aeec1ffe6 100644 --- a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py +++ b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py @@ -4,10 +4,9 @@ from docutils.core import publish_parts from webob.exc import HTTPFound -from routes import url_for - from repoze.bfg.chameleon_zpt import render_template_to_response from repoze.bfg.view import static +from repoze.bfg.url import route_url from tutorial.models import DBSession from tutorial.models import Page @@ -18,7 +17,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)") static_view = static('templates/static') def view_wiki(context, request): - return HTTPFound(location = url_for('view_page', pagename='FrontPage')) + return HTTPFound(location = route_url('view_page', pagename='FrontPage')) def view_page(context, request): matchdict = request.matchdict @@ -29,15 +28,15 @@ def view_page(context, request): word = match.group(1) exists = session.query(Page).filter_by(name=word).all() if exists: - view_url = url_for('view_page', pagename=word) + view_url = route_url('view_page', pagename=word) return '<a href="%s">%s</a>' % (view_url, word) else: - add_url = url_for('add_page', pagename=word) + add_url = route_url('add_page', pagename=word) return '<a href="%s">%s</a>' % (add_url, word) content = publish_parts(page.data, writer_name='html')['html_body'] content = wikiwords.sub(check, content) - edit_url = url_for('edit_page', pagename=matchdict['pagename']) + edit_url = route_url('edit_page', pagename=matchdict['pagename']) return render_template_to_response('templates/view.pt', request = request, page = page, @@ -51,8 +50,8 @@ def add_page(context, request): body = request.params['body'] page = Page(name, body) session.add(page) - return HTTPFound(location = url_for('view_page', pagename=name)) - save_url = url_for('add_page', pagename=name) + return HTTPFound(location = route_url('view_page', pagename=name)) + save_url = route_url('add_page', pagename=name) page = Page('', '') return render_template_to_response('templates/edit.pt', request = request, @@ -66,12 +65,12 @@ def edit_page(context, request): if 'form.submitted' in request.params: page.data = request.params['body'] session.add(page) - return HTTPFound(location = url_for('view_page', + return HTTPFound(location = route_url('view_page', pagename=name)) return render_template_to_response('templates/edit.pt', request = request, page = page, - save_url = url_for('edit_page', + save_url = route_url('edit_page', pagename=name), ) |