- Use ``repoze.bfg.url.route_url`` API in tutorials rather than Routes

  ``url_for`` API.

4 files changed, 26 insertions, 29 deletions

diff --git a/docs/tutorials/bfgwiki2/definingviews.rst b/docs/tutorials/bfgwiki2/definingviews.rst
index 515090e91..e12800d13 100644
--- a/docs/tutorials/bfgwiki2/definingviews.rst
+++ b/docs/tutorials/bfgwiki2/definingviews.rst
@@ -71,10 +71,11 @@ The ``view_wiki`` function will respond as the default view of a
 ``Wiki`` model object.  It always redirects to a URL which represents
 the path to our "FrontPage".  It returns an instance of the
 ``webob.exc.HTTPFound`` class (instances of which implement the WebOb
-:term:`response` interface), It will use the the ``routes.url_for``
-API to construct a URL to the ``FrontPage`` page
-(e.g. ``http://localhost:6543/FrontPage``), and will use it as the
-"location" of the HTTPFound response, forming an HTTP redirect.
+:term:`response` interface), It will use the the
+``repoze.bfg.url.route_url`` API to construct a URL to the
+``FrontPage`` page (e.g. ``http://localhost:6543/FrontPage``), and
+will use it as the "location" of the HTTPFound response, forming an
+HTTP redirect.
 
 The ``view_page`` view function
 -------------------------------
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
index b5a2a836c..e3b554a45 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
@@ -1,16 +1,14 @@
 from webob.exc import HTTPFound
 
-from routes import url_for
-
 from repoze.bfg.chameleon_zpt import render_template_to_response
-
 from repoze.bfg.security import remember
 from repoze.bfg.security import forget
+from repoze.bfg.url import route_url
 
 from tutorial.run import USERS
 
 def login(request):
-    login_url = url_for('login')
+    login_url = route_url('login')
     referrer = request.environ.get('HTTP_REFERER', '/')
     if referrer == login_url:
         referrer = '/' # never use the login form itself as came_from
@@ -39,6 +37,6 @@ def login(request):
     
 def logout(request):
     headers = forget(request)
-    return HTTPFound(location = url_for('view_wiki'),
+    return HTTPFound(location = route_url('view_wiki'),
                      headers = headers)
     
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
index fd6c410e2..bd146673c 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
@@ -4,11 +4,10 @@ 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.security import authenticated_userid
+from repoze.bfg.url import route_url
 
 from tutorial.models import DBSession
 from tutorial.models import Page
@@ -19,7 +18,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 static_view = static('templates/static')
 
 def view_wiki(request):
-    return HTTPFound(location = url_for('view_page', pagename='FrontPage'))
+    return HTTPFound(location = route_url('view_page', pagename='FrontPage'))
 
 def view_page(request):
     pagename = request.matchdict['pagename']
@@ -30,15 +29,15 @@ def view_page(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=pagename)
+    edit_url = route_url('edit_page', pagename=pagename)
     logged_in = authenticated_userid(request)
     return render_template_to_response('templates/view.pt',
                                        request = request,
@@ -54,8 +53,8 @@ def add_page(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('', '')
     logged_in = authenticated_userid(request)
     return render_template_to_response('templates/edit.pt',
@@ -71,7 +70,7 @@ def edit_page(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))
 
     logged_in = authenticated_userid(request)
@@ -79,6 +78,6 @@ def edit_page(request):
                                        request = request,
                                        page = page,
                                        logged_in = logged_in,
-                                       save_url = url_for('edit_page',
+                                       save_url = route_url('edit_page',
                                                           pagename=name),
                                        )
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),
                                        )