Reverse ordering of args to route_url.

3 files changed, 20 insertions, 20 deletions

diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
index 651259855..4656a244b 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(request, 'login')
+    login_url = route_url('login', request)
     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(request, 'view_wiki'),
+    return HTTPFound(location = route_url('view_wiki', request),
                      headers = headers)
     
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
index fe2be54a1..b36ad6192 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
@@ -18,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 = route_url(request, 'view_page',
+    return HTTPFound(location = route_url('view_page', request,
                                           pagename='FrontPage'))
 
 def view_page(request):
@@ -30,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(request, 'view_page', pagename=word)
+            view_url = route_url('view_page', request, pagename=word)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
-            add_url = route_url(request, 'add_page', pagename=word)
+            add_url = route_url('add_page', request, 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(request, 'edit_page', pagename=pagename)
+    edit_url = route_url('edit_page', request, pagename=pagename)
     logged_in = authenticated_userid(request)
     return render_template_to_response('templates/view.pt',
                                        request = request,
@@ -54,9 +54,9 @@ def add_page(request):
         body = request.params['body']
         page = Page(name, body)
         session.add(page)
-        return HTTPFound(location = route_url(request, 'view_page',
+        return HTTPFound(location = route_url('view_page', request,
                                               pagename=name))
-    save_url = route_url(request, 'add_page', pagename=name)
+    save_url = route_url('add_page', request, pagename=name)
     page = Page('', '')
     logged_in = authenticated_userid(request)
     return render_template_to_response('templates/edit.pt',
@@ -72,7 +72,7 @@ def edit_page(request):
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         session.add(page)
-        return HTTPFound(location = route_url(request, 'view_page',
+        return HTTPFound(location = route_url('view_page', request,
                                               pagename=name))
 
     logged_in = authenticated_userid(request)
@@ -80,7 +80,7 @@ def edit_page(request):
                                        request = request,
                                        page = page,
                                        logged_in = logged_in,
-                                       save_url = route_url(request,
-                                                            'edit_page',
+                                       save_url = route_url('edit_page',
+                                                            request,
                                                             pagename=name),
                                        )
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py
index 947950896..4d4713e9f 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py
@@ -17,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 = route_url(request, 'view_page',
+    return HTTPFound(location = route_url('view_page', request,
                                           pagename='FrontPage'))
 
 def view_page(context, request):
@@ -29,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(request, 'view_page', pagename=word)
+            view_url = route_url('view_page', request, pagename=word)
             return '<a href="%s">%s</a>' % (view_url, word)
         else:
-            add_url = route_url(request, 'add_page', pagename=word)
+            add_url = route_url('add_page', request, 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(request, 'edit_page', pagename=matchdict['pagename'])
+    edit_url = route_url('edit_page', request, pagename=matchdict['pagename'])
     return render_template_to_response('templates/view.pt',
                                        request = request,
                                        page = page,
@@ -51,9 +51,9 @@ def add_page(context, request):
         body = request.params['body']
         page = Page(name, body)
         session.add(page)
-        return HTTPFound(location = route_url(request, 'view_page',
+        return HTTPFound(location = route_url('view_page', request,
                                               pagename=name))
-    save_url = route_url(request, 'add_page', pagename=name)
+    save_url = route_url('add_page', request, pagename=name)
     page = Page('', '')
     return render_template_to_response('templates/edit.pt',
                                        request = request,
@@ -67,13 +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(request, 'view_page',
+        return HTTPFound(location = route_url('view_page', request,
                                               pagename=name))
 
     return render_template_to_response('templates/edit.pt',
                                        request = request,
                                        page = page,
-                                       save_url = route_url(request,
-                                                            'edit_page',
+                                       save_url = route_url('edit_page',
+                                                            request,
                                                             pagename=name),
                                        )