- 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``.

5 files changed, 37 insertions, 42 deletions

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),
         )