- All tutorials now use - The ``route_url``, ``route_path``,

  ``resource_url``, ``static_url``, and ``current_route_url`` methods of the
  request rather than the function variants imported from ``pyramid.url``.

15 files changed, 77 insertions, 92 deletions

diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 3970d482c..9d783f8cb 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -86,10 +86,11 @@ resource named "FrontPage".  To do so, it returns an instance of the
 :class:`pyramid.httpexceptions.HTTPFound` class (instances of which implement
 the :class:`pyramid.interfaces.IResponse` interface like
 :class:`pyramid.response.Response` does).  The
-:func:`pyramid.url.resource_url` API.  :func:`pyramid.url.resource_url`
-constructs a URL to the ``FrontPage`` page resource
-(e.g. ``http://localhost:6543/FrontPage``), and uses it as the "location" of
-the HTTPFound response, forming an HTTP redirect.
+:meth:`pyramid.request.Request.resource_url` API.
+:meth:`pyramid.request.Request.resource_url` constructs a URL to the
+``FrontPage`` page resource (e.g. ``http://localhost:6543/FrontPage``), and
+uses it as the "location" of the HTTPFound response, forming an HTTP
+redirect.
 
 The ``view_page`` view function
 -------------------------------
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/login.py b/docs/tutorials/wiki/src/authorization/tutorial/login.py
index 334115880..d608a7d0b 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/login.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/login.py
@@ -3,7 +3,6 @@ from pyramid.httpexceptions import HTTPFound
 from pyramid.security import remember
 from pyramid.security import forget
 from pyramid.view import view_config
-from pyramid.url import resource_url
 
 from tutorial.security import USERS
 
@@ -12,7 +11,7 @@ from tutorial.security import USERS
 @view_config(context='pyramid.httpexceptions.HTTPForbidden',
              renderer='templates/login.pt')
 def login(request):
-    login_url = resource_url(request.context, request, 'login')
+    login_url = request.resource_url(request.context, 'login')
     referrer = request.url
     if referrer == login_url:
         referrer = '/' # never use the login form itself as came_from
@@ -40,6 +39,6 @@ def login(request):
 @view_config(context='tutorial.models.Wiki', name='logout')
 def logout(request):
     headers = forget(request)
-    return HTTPFound(location = resource_url(request.context, request),
+    return HTTPFound(location = request.resource_url(request.context),
                      headers = headers)
     
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/tests.py b/docs/tutorials/wiki/src/authorization/tutorial/tests.py
index aaf753816..a4a4e2754 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/tests.py
@@ -80,15 +80,14 @@ class AddPageTests(unittest.TestCase):
         return add_page(context, request)
 
     def test_it_notsubmitted(self):
-        from pyramid.url import resource_url
         context = testing.DummyResource()
         request = testing.DummyRequest()
         request.subpath = ['AnotherPage']
         info = self._callFUT(context, request)
         self.assertEqual(info['page'].data,'')
         self.assertEqual(info['save_url'],
-                         resource_url(
-                             context, request, 'add_page', 'AnotherPage'))
+                         request.resource_url(
+                             context, 'add_page', 'AnotherPage'))
         
     def test_it_submitted(self):
         context = testing.DummyResource()
@@ -107,13 +106,12 @@ class EditPageTests(unittest.TestCase):
         return edit_page(context, request)
 
     def test_it_notsubmitted(self):
-        from pyramid.url import resource_url
         context = testing.DummyResource()
         request = testing.DummyRequest()
         info = self._callFUT(context, request)
         self.assertEqual(info['page'], context)
         self.assertEqual(info['save_url'],
-                         resource_url(context, request, 'edit_page'))
+                         request.resource_url(context, 'edit_page'))
         
     def test_it_submitted(self):
         context = testing.DummyResource()
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py
index a83e17de4..a570410ca 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views.py
@@ -2,7 +2,6 @@ from docutils.core import publish_parts
 import re
 
 from pyramid.httpexceptions import HTTPFound
-from pyramid.url import resource_url
 from pyramid.view import view_config
 from pyramid.security import authenticated_userid
 
@@ -13,7 +12,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
 @view_config(context='tutorial.models.Wiki', permission='view')
 def view_wiki(context, request):
-    return HTTPFound(location=resource_url(context, request, 'FrontPage'))
+    return HTTPFound(location=request.resource_url(context, 'FrontPage'))
 
 @view_config(context='tutorial.models.Page',
              renderer='templates/view.pt', permission='view')
@@ -24,7 +23,7 @@ def view_page(context, request):
         word = match.group(1)
         if word in wiki:
             page = wiki[word]
-            view_url = resource_url(page, request)
+            view_url = request.resource_url(page)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
             add_url = request.application_url + '/add_page/' + word 
@@ -32,7 +31,7 @@ def view_page(context, request):
 
     content = publish_parts(context.data, writer_name='html')['html_body']
     content = wikiwords.sub(check, content)
-    edit_url = resource_url(context, request, 'edit_page')
+    edit_url = request.resource_url(context, 'edit_page')
 
     logged_in = authenticated_userid(request)
 
@@ -50,8 +49,8 @@ def add_page(context, request):
         page.__name__ = name
         page.__parent__ = context
         context[name] = page
-        return HTTPFound(location = resource_url(page, request))
-    save_url = resource_url(context, request, 'add_page', name)
+        return HTTPFound(location = request.resource_url(page))
+    save_url = request.resource_url(context, 'add_page', name)
     page = Page('')
     page.__name__ = name
     page.__parent__ = context
@@ -66,11 +65,11 @@ def add_page(context, request):
 def edit_page(context, request):
     if 'form.submitted' in request.params:
         context.data = request.params['body']
-        return HTTPFound(location = resource_url(context, request))
+        return HTTPFound(location = request.resource_url(context))
 
     logged_in = authenticated_userid(request)
 
     return dict(page = context,
-                save_url = resource_url(context, request, 'edit_page'),
+                save_url = request.resource_url(context, 'edit_page'),
                 logged_in = logged_in)
     
diff --git a/docs/tutorials/wiki/src/tests/tutorial/login.py b/docs/tutorials/wiki/src/tests/tutorial/login.py
index 334115880..d608a7d0b 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/login.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/login.py
@@ -3,7 +3,6 @@ from pyramid.httpexceptions import HTTPFound
 from pyramid.security import remember
 from pyramid.security import forget
 from pyramid.view import view_config
-from pyramid.url import resource_url
 
 from tutorial.security import USERS
 
@@ -12,7 +11,7 @@ from tutorial.security import USERS
 @view_config(context='pyramid.httpexceptions.HTTPForbidden',
              renderer='templates/login.pt')
 def login(request):
-    login_url = resource_url(request.context, request, 'login')
+    login_url = request.resource_url(request.context, 'login')
     referrer = request.url
     if referrer == login_url:
         referrer = '/' # never use the login form itself as came_from
@@ -40,6 +39,6 @@ def login(request):
 @view_config(context='tutorial.models.Wiki', name='logout')
 def logout(request):
     headers = forget(request)
-    return HTTPFound(location = resource_url(request.context, request),
+    return HTTPFound(location = request.resource_url(request.context),
                      headers = headers)
     
diff --git a/docs/tutorials/wiki/src/tests/tutorial/tests.py b/docs/tutorials/wiki/src/tests/tutorial/tests.py
index 6fbf9ce8b..86ddba7b7 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/tests.py
@@ -80,7 +80,6 @@ class AddPageTests(unittest.TestCase):
         return add_page(context, request)
 
     def test_it_notsubmitted(self):
-        from pyramid.url import resource_url
         context = testing.DummyResource()
         request = testing.DummyRequest()
         request.subpath = ['AnotherPage']
@@ -88,7 +87,7 @@ class AddPageTests(unittest.TestCase):
         self.assertEqual(info['page'].data,'')
         self.assertEqual(
             info['save_url'],
-            resource_url(context, request, 'add_page', 'AnotherPage'))
+            request.resource_url(context, 'add_page', 'AnotherPage'))
 
     def test_it_submitted(self):
         context = testing.DummyResource()
@@ -107,13 +106,12 @@ class EditPageTests(unittest.TestCase):
         return edit_page(context, request)
 
     def test_it_notsubmitted(self):
-        from pyramid.url import resource_url
         context = testing.DummyResource()
         request = testing.DummyRequest()
         info = self._callFUT(context, request)
         self.assertEqual(info['page'], context)
         self.assertEqual(info['save_url'],
-                         resource_url(context, request, 'edit_page'))
+                         request.resource_url(context, 'edit_page'))
 
     def test_it_submitted(self):
         context = testing.DummyResource()
diff --git a/docs/tutorials/wiki/src/tests/tutorial/views.py b/docs/tutorials/wiki/src/tests/tutorial/views.py
index a83e17de4..a570410ca 100644
--- a/docs/tutorials/wiki/src/tests/tutorial/views.py
+++ b/docs/tutorials/wiki/src/tests/tutorial/views.py
@@ -2,7 +2,6 @@ from docutils.core import publish_parts
 import re
 
 from pyramid.httpexceptions import HTTPFound
-from pyramid.url import resource_url
 from pyramid.view import view_config
 from pyramid.security import authenticated_userid
 
@@ -13,7 +12,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
 @view_config(context='tutorial.models.Wiki', permission='view')
 def view_wiki(context, request):
-    return HTTPFound(location=resource_url(context, request, 'FrontPage'))
+    return HTTPFound(location=request.resource_url(context, 'FrontPage'))
 
 @view_config(context='tutorial.models.Page',
              renderer='templates/view.pt', permission='view')
@@ -24,7 +23,7 @@ def view_page(context, request):
         word = match.group(1)
         if word in wiki:
             page = wiki[word]
-            view_url = resource_url(page, request)
+            view_url = request.resource_url(page)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
             add_url = request.application_url + '/add_page/' + word 
@@ -32,7 +31,7 @@ def view_page(context, request):
 
     content = publish_parts(context.data, writer_name='html')['html_body']
     content = wikiwords.sub(check, content)
-    edit_url = resource_url(context, request, 'edit_page')
+    edit_url = request.resource_url(context, 'edit_page')
 
     logged_in = authenticated_userid(request)
 
@@ -50,8 +49,8 @@ def add_page(context, request):
         page.__name__ = name
         page.__parent__ = context
         context[name] = page
-        return HTTPFound(location = resource_url(page, request))
-    save_url = resource_url(context, request, 'add_page', name)
+        return HTTPFound(location = request.resource_url(page))
+    save_url = request.resource_url(context, 'add_page', name)
     page = Page('')
     page.__name__ = name
     page.__parent__ = context
@@ -66,11 +65,11 @@ def add_page(context, request):
 def edit_page(context, request):
     if 'form.submitted' in request.params:
         context.data = request.params['body']
-        return HTTPFound(location = resource_url(context, request))
+        return HTTPFound(location = request.resource_url(context))
 
     logged_in = authenticated_userid(request)
 
     return dict(page = context,
-                save_url = resource_url(context, request, 'edit_page'),
+                save_url = request.resource_url(context, 'edit_page'),
                 logged_in = logged_in)
     
diff --git a/docs/tutorials/wiki/src/views/tutorial/tests.py b/docs/tutorials/wiki/src/views/tutorial/tests.py
index 28e424884..9eac2a432 100644
--- a/docs/tutorials/wiki/src/views/tutorial/tests.py
+++ b/docs/tutorials/wiki/src/views/tutorial/tests.py
@@ -80,7 +80,6 @@ class AddPageTests(unittest.TestCase):
         return add_page(context, request)
 
     def test_it_notsubmitted(self):
-        from pyramid.url import resource_url
         context = testing.DummyResource()
         request = testing.DummyRequest()
         request.subpath = ['AnotherPage']
@@ -88,7 +87,7 @@ class AddPageTests(unittest.TestCase):
         self.assertEqual(info['page'].data,'')
         self.assertEqual(
             info['save_url'],
-            resource_url(context, request, 'add_page', 'AnotherPage'))
+            request.resource_url(context, 'add_page', 'AnotherPage'))
         
     def test_it_submitted(self):
         context = testing.DummyResource()
@@ -107,13 +106,12 @@ class EditPageTests(unittest.TestCase):
         return edit_page(context, request)
 
     def test_it_notsubmitted(self):
-        from pyramid.url import resource_url
         context = testing.DummyResource()
         request = testing.DummyRequest()
         info = self._callFUT(context, request)
         self.assertEqual(info['page'], context)
         self.assertEqual(info['save_url'],
-                         resource_url(context, request, 'edit_page'))
+                         request.resource_url(context, 'edit_page'))
         
     def test_it_submitted(self):
         context = testing.DummyResource()
diff --git a/docs/tutorials/wiki/src/views/tutorial/views.py b/docs/tutorials/wiki/src/views/tutorial/views.py
index 42420f2fe..245cda682 100644
--- a/docs/tutorials/wiki/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki/src/views/tutorial/views.py
@@ -2,7 +2,6 @@ from docutils.core import publish_parts
 import re
 
 from pyramid.httpexceptions import HTTPFound
-from pyramid.url import resource_url
 from pyramid.view import view_config
 
 from tutorial.models import Page
@@ -12,7 +11,7 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
 @view_config(context='tutorial.models.Wiki')
 def view_wiki(context, request):
-    return HTTPFound(location=resource_url(context, request, 'FrontPage'))
+    return HTTPFound(location=request.resource_url(context, 'FrontPage'))
 
 @view_config(context='tutorial.models.Page',
              renderer='tutorial:templates/view.pt')
@@ -23,7 +22,7 @@ def view_page(context, request):
         word = match.group(1)
         if word in wiki:
             page = wiki[word]
-            view_url = resource_url(page, request)
+            view_url = request.resource_url(page)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
             add_url = request.application_url + '/add_page/' + word 
@@ -31,7 +30,7 @@ def view_page(context, request):
 
     content = publish_parts(context.data, writer_name='html')['html_body']
     content = wikiwords.sub(check, content)
-    edit_url = resource_url(context, request, 'edit_page')
+    edit_url = request.resource_url(context, 'edit_page')
     return dict(page = context, content = content, edit_url = edit_url)
 
 @view_config(name='add_page', context='tutorial.models.Wiki',
@@ -44,8 +43,8 @@ def add_page(context, request):
         page.__name__ = name
         page.__parent__ = context
         context[name] = page
-        return HTTPFound(location = resource_url(page, request))
-    save_url = resource_url(context, request, 'add_page', name)
+        return HTTPFound(location = request.resource_url(page))
+    save_url = request.resource_url(context, 'add_page', name)
     page = Page('')
     page.__name__ = name
     page.__parent__ = context
@@ -56,9 +55,9 @@ def add_page(context, request):
 def edit_page(context, request):
     if 'form.submitted' in request.params:
         context.data = request.params['body']
-        return HTTPFound(location = resource_url(context, request))
+        return HTTPFound(location = request.resource_url(context))
 
     return dict(page = context,
-                save_url = resource_url(context, request, 'edit_page'))
+                save_url = request.resource_url(context, 'edit_page'))
     
     
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index c91d1d914..8f6dd6455 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -93,9 +93,9 @@ The ``view_wiki`` function returns an instance of the
 :class:`pyramid.httpexceptions.HTTPFound` class (instances of which implement
 the :class:`pyramid.interfaces.IResponse` interface like
 :class:`pyramid.response.Response` does), It will use the
-:func:`pyramid.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.
+:meth:`pyramid.request.Request.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/wiki2/src/authorization/tutorial/login.py b/docs/tutorials/wiki2/src/authorization/tutorial/login.py
index 7a1d1f663..5a825d8d6 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/login.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/login.py
@@ -1,12 +1,11 @@
 from pyramid.httpexceptions import HTTPFound
 from pyramid.security import remember
 from pyramid.security import forget
-from pyramid.url import route_url
 
 from tutorial.security import USERS
 
 def login(request):
-    login_url = route_url('login', request)
+    login_url = request.route_url('login')
     referrer = request.url
     if referrer == login_url:
         referrer = '/' # never use the login form itself as came_from
@@ -33,6 +32,6 @@ def login(request):
     
 def logout(request):
     headers = forget(request)
-    return HTTPFound(location = route_url('view_wiki', request),
+    return HTTPFound(location = request.route_url('view_wiki'),
                      headers = headers)
     
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/views.py b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
index e0b84971d..fc85d4585 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
@@ -4,7 +4,6 @@ from docutils.core import publish_parts
 
 from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 from pyramid.security import authenticated_userid
-from pyramid.url import route_url
 
 from tutorial.models import DBSession
 from tutorial.models import Page
@@ -13,8 +12,8 @@ from tutorial.models import Page
 wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
 def view_wiki(request):
-    return HTTPFound(location = route_url('view_page', request,
-                                          pagename='FrontPage'))
+    return HTTPFound(location = request.route_url('view_page',
+                                                  pagename='FrontPage'))
 
 def view_page(request):
     pagename = request.matchdict['pagename']
@@ -27,15 +26,15 @@ def view_page(request):
         word = match.group(1)
         exists = session.query(Page).filter_by(name=word).all()
         if exists:
-            view_url = route_url('view_page', request, pagename=word)
+            view_url = request.route_url('view_page', pagename=word)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
-            add_url = route_url('add_page', request, pagename=word)
+            add_url = request.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 = route_url('edit_page', request, pagename=pagename)
+    edit_url = request.route_url('edit_page', pagename=pagename)
     logged_in = authenticated_userid(request)
     return dict(page=page, content=content, edit_url=edit_url,
                 logged_in=logged_in)
@@ -47,9 +46,9 @@ def add_page(request):
         body = request.params['body']
         page = Page(name, body)
         session.add(page)
-        return HTTPFound(location = route_url('view_page', request,
-                                              pagename=name))
-    save_url = route_url('add_page', request, pagename=name)
+        return HTTPFound(location = request.route_url('view_page',
+                                                      pagename=name))
+    save_url = request.route_url('add_page', pagename=name)
     page = Page('', '')
     logged_in = authenticated_userid(request)
     return dict(page=page, save_url=save_url, logged_in=logged_in)
@@ -61,12 +60,12 @@ def edit_page(request):
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         session.add(page)
-        return HTTPFound(location = route_url('view_page', request,
-                                              pagename=name))
+        return HTTPFound(location = request.route_url('view_page',
+                                                      pagename=name))
 
     logged_in = authenticated_userid(request)
     return dict(
         page=page,
-        save_url = route_url('edit_page', request, pagename=name),
+        save_url = request.route_url('edit_page', pagename=name),
         logged_in = logged_in,
         )
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/login.py b/docs/tutorials/wiki2/src/tests/tutorial/login.py
index 7a1d1f663..5a825d8d6 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/login.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/login.py
@@ -1,12 +1,11 @@
 from pyramid.httpexceptions import HTTPFound
 from pyramid.security import remember
 from pyramid.security import forget
-from pyramid.url import route_url
 
 from tutorial.security import USERS
 
 def login(request):
-    login_url = route_url('login', request)
+    login_url = request.route_url('login')
     referrer = request.url
     if referrer == login_url:
         referrer = '/' # never use the login form itself as came_from
@@ -33,6 +32,6 @@ def login(request):
     
 def logout(request):
     headers = forget(request)
-    return HTTPFound(location = route_url('view_wiki', request),
+    return HTTPFound(location = request.route_url('view_wiki'),
                      headers = headers)
     
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/views.py b/docs/tutorials/wiki2/src/tests/tutorial/views.py
index e0b84971d..fc85d4585 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/views.py
@@ -4,7 +4,6 @@ from docutils.core import publish_parts
 
 from pyramid.httpexceptions import HTTPFound, HTTPNotFound
 from pyramid.security import authenticated_userid
-from pyramid.url import route_url
 
 from tutorial.models import DBSession
 from tutorial.models import Page
@@ -13,8 +12,8 @@ from tutorial.models import Page
 wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
 def view_wiki(request):
-    return HTTPFound(location = route_url('view_page', request,
-                                          pagename='FrontPage'))
+    return HTTPFound(location = request.route_url('view_page',
+                                                  pagename='FrontPage'))
 
 def view_page(request):
     pagename = request.matchdict['pagename']
@@ -27,15 +26,15 @@ def view_page(request):
         word = match.group(1)
         exists = session.query(Page).filter_by(name=word).all()
         if exists:
-            view_url = route_url('view_page', request, pagename=word)
+            view_url = request.route_url('view_page', pagename=word)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
-            add_url = route_url('add_page', request, pagename=word)
+            add_url = request.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 = route_url('edit_page', request, pagename=pagename)
+    edit_url = request.route_url('edit_page', pagename=pagename)
     logged_in = authenticated_userid(request)
     return dict(page=page, content=content, edit_url=edit_url,
                 logged_in=logged_in)
@@ -47,9 +46,9 @@ def add_page(request):
         body = request.params['body']
         page = Page(name, body)
         session.add(page)
-        return HTTPFound(location = route_url('view_page', request,
-                                              pagename=name))
-    save_url = route_url('add_page', request, pagename=name)
+        return HTTPFound(location = request.route_url('view_page',
+                                                      pagename=name))
+    save_url = request.route_url('add_page', pagename=name)
     page = Page('', '')
     logged_in = authenticated_userid(request)
     return dict(page=page, save_url=save_url, logged_in=logged_in)
@@ -61,12 +60,12 @@ def edit_page(request):
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         session.add(page)
-        return HTTPFound(location = route_url('view_page', request,
-                                              pagename=name))
+        return HTTPFound(location = request.route_url('view_page',
+                                                      pagename=name))
 
     logged_in = authenticated_userid(request)
     return dict(
         page=page,
-        save_url = route_url('edit_page', request, pagename=name),
+        save_url = request.route_url('edit_page', pagename=name),
         logged_in = logged_in,
         )
diff --git a/docs/tutorials/wiki2/src/views/tutorial/views.py b/docs/tutorials/wiki2/src/views/tutorial/views.py
index f3d7f4a99..e04b96ae4 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/views.py
@@ -3,7 +3,6 @@ import re
 from docutils.core import publish_parts
 
 from pyramid.httpexceptions import HTTPFound, HTTPNotFound
-from pyramid.url import route_url
 
 from tutorial.models import DBSession
 from tutorial.models import Page
@@ -12,8 +11,8 @@ from tutorial.models import Page
 wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
 def view_wiki(request):
-    return HTTPFound(location = route_url('view_page', request,
-                                          pagename='FrontPage'))
+    return HTTPFound(location = request.route_url('view_page',
+                                                  pagename='FrontPage'))
 
 def view_page(request):
     pagename = request.matchdict['pagename']
@@ -26,15 +25,15 @@ def view_page(request):
         word = match.group(1)
         exists = session.query(Page).filter_by(name=word).all()
         if exists:
-            view_url = route_url('view_page', request, pagename=word)
+            view_url = request.route_url('view_page', pagename=word)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
-            add_url = route_url('add_page', request, pagename=word)
+            add_url = request.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 = route_url('edit_page', request, pagename=pagename)
+    edit_url = request.route_url('edit_page', pagename=pagename)
     return dict(page=page, content=content, edit_url=edit_url)
 
 def add_page(request):
@@ -44,9 +43,9 @@ def add_page(request):
         body = request.params['body']
         page = Page(name, body)
         session.add(page)
-        return HTTPFound(location = route_url('view_page', request,
-                                              pagename=name))
-    save_url = route_url('add_page', request, pagename=name)
+        return HTTPFound(location = request.route_url('view_page',
+                                                      pagename=name))
+    save_url = request.route_url('add_page', pagename=name)
     page = Page('', '')
     return dict(page=page, save_url=save_url)
 
@@ -57,9 +56,9 @@ def edit_page(request):
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         session.add(page)
-        return HTTPFound(location = route_url('view_page', request,
-                                              pagename=name))
+        return HTTPFound(location = request.route_url('view_page',
+                                                      pagename=name))
     return dict(
         page=page,
-        save_url = route_url('edit_page', request, pagename=name),
+        save_url = request.route_url('edit_page', pagename=name),
         )