Change the implementation and the signature for ``route_url``.

4 files changed, 31 insertions, 24 deletions

diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index dab026455..356a14aef 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -399,10 +399,11 @@ this.
 .. code-block:: python
 
    from repoze.bfg.url import route_url
-   url = route_url('foo', a='1', b='2', c='3')
+   url = route_url(request, 'foo', a='1', b='2', c='3')
 
 This would return something like the string
-``http://example.com/1/2/3``.
+``http://example.com/1/2/3`` (at least if the current protocol and
+hostname implied ``http:/example.com``).
 
 Cleaning Up After a Request
 ---------------------------
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
index e3b554a45..651259855 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
@@ -8,7 +8,7 @@ from repoze.bfg.url import route_url
 from tutorial.run import USERS
 
 def login(request):
-    login_url = route_url('login')
+    login_url = route_url(request, 'login')
     referrer = request.environ.get('HTTP_REFERER', '/')
     if referrer == login_url:
         referrer = '/' # never use the login form itself as came_from
@@ -37,6 +37,6 @@ def login(request):
     
 def logout(request):
     headers = forget(request)
-    return HTTPFound(location = route_url('view_wiki'),
+    return HTTPFound(location = route_url(request, '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 bd146673c..fe2be54a1 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
@@ -18,7 +18,8 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 static_view = static('templates/static')
 
 def view_wiki(request):
-    return HTTPFound(location = route_url('view_page', pagename='FrontPage'))
+    return HTTPFound(location = route_url(request, 'view_page',
+                                          pagename='FrontPage'))
 
 def view_page(request):
     pagename = request.matchdict['pagename']
@@ -29,15 +30,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', pagename=word)
+            view_url = route_url(request, 'view_page', pagename=word)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
-            add_url = route_url('add_page', pagename=word)
+            add_url = route_url(request, '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', pagename=pagename)
+    edit_url = route_url(request, 'edit_page', pagename=pagename)
     logged_in = authenticated_userid(request)
     return render_template_to_response('templates/view.pt',
                                        request = request,
@@ -53,8 +54,9 @@ def add_page(request):
         body = request.params['body']
         page = Page(name, body)
         session.add(page)
-        return HTTPFound(location = route_url('view_page', pagename=name))
-    save_url = route_url('add_page', pagename=name)
+        return HTTPFound(location = route_url(request, 'view_page',
+                                              pagename=name))
+    save_url = route_url(request, 'add_page', pagename=name)
     page = Page('', '')
     logged_in = authenticated_userid(request)
     return render_template_to_response('templates/edit.pt',
@@ -70,14 +72,15 @@ 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',
-                                            pagename=name))
+        return HTTPFound(location = route_url(request, 'view_page',
+                                              pagename=name))
 
     logged_in = authenticated_userid(request)
     return render_template_to_response('templates/edit.pt',
                                        request = request,
                                        page = page,
                                        logged_in = logged_in,
-                                       save_url = route_url('edit_page',
-                                                          pagename=name),
+                                       save_url = route_url(request,
+                                                            '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 aeec1ffe6..947950896 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py
@@ -17,7 +17,8 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 static_view = static('templates/static')
 
 def view_wiki(context, request):
-    return HTTPFound(location = route_url('view_page', pagename='FrontPage'))
+    return HTTPFound(location = route_url(request, 'view_page',
+                                          pagename='FrontPage'))
 
 def view_page(context, request):
     matchdict = request.matchdict
@@ -28,15 +29,15 @@ def view_page(context, request):
         word = match.group(1)
         exists = session.query(Page).filter_by(name=word).all()
         if exists:
-            view_url = route_url('view_page', pagename=word)
+            view_url = route_url(request, 'view_page', pagename=word)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
-            add_url = route_url('add_page', pagename=word)
+            add_url = route_url(request, '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', pagename=matchdict['pagename'])
+    edit_url = route_url(request, 'edit_page', pagename=matchdict['pagename'])
     return render_template_to_response('templates/view.pt',
                                        request = request,
                                        page = page,
@@ -50,8 +51,9 @@ def add_page(context, request):
         body = request.params['body']
         page = Page(name, body)
         session.add(page)
-        return HTTPFound(location = route_url('view_page', pagename=name))
-    save_url = route_url('add_page', pagename=name)
+        return HTTPFound(location = route_url(request, 'view_page',
+                                              pagename=name))
+    save_url = route_url(request, 'add_page', pagename=name)
     page = Page('', '')
     return render_template_to_response('templates/edit.pt',
                                        request = request,
@@ -65,12 +67,13 @@ def edit_page(context, request):
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         session.add(page)
-        return HTTPFound(location = route_url('view_page',
-                                            pagename=name))
+        return HTTPFound(location = route_url(request, 'view_page',
+                                              pagename=name))
 
     return render_template_to_response('templates/edit.pt',
                                        request = request,
                                        page = page,
-                                       save_url = route_url('edit_page',
-                                                          pagename=name),
+                                       save_url = route_url(request,
+                                                            'edit_page',
+                                                            pagename=name),
                                        )