Merge branch 'master' of github.com:Pylons/pyramid

3 files changed, 24 insertions, 24 deletions

diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/views.py b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
index c7670b049..0d085b0e2 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/views.py
@@ -60,14 +60,14 @@ def view_page(request):
 @view_config(route_name='add_page', renderer='templates/edit.pt',
              permission='edit')
 def add_page(request):
-    name = request.matchdict['pagename']
+    pagename = request.matchdict['pagename']
     if 'form.submitted' in request.params:
         body = request.params['body']
-        page = Page(name, body)
+        page = Page(pagename, body)
         DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
-    save_url = request.route_url('add_page', pagename=name)
+                                                      pagename=pagename))
+    save_url = request.route_url('add_page', pagename=pagename)
     page = Page('', '')
     return dict(page=page, save_url=save_url,
                 logged_in=authenticated_userid(request))
@@ -75,16 +75,16 @@ def add_page(request):
 @view_config(route_name='edit_page', renderer='templates/edit.pt',
              permission='edit')
 def edit_page(request):
-    name = request.matchdict['pagename']
-    page = DBSession.query(Page).filter_by(name=name).one()
+    pagename = request.matchdict['pagename']
+    page = DBSession.query(Page).filter_by(name=pagename).one()
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
+                                                      pagename=pagename))
     return dict(
         page=page,
-        save_url = request.route_url('edit_page', pagename=name),
+        save_url = request.route_url('edit_page', pagename=pagename),
         logged_in=authenticated_userid(request),
         )
 
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/views.py b/docs/tutorials/wiki2/src/tests/tutorial/views.py
index f2a33af1e..42ac0eb7f 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/views.py
@@ -61,15 +61,15 @@ def view_page(request):
 @view_config(route_name='add_page', renderer='templates/edit.pt',
              permission='edit')
 def add_page(request):
-    name = request.matchdict['pagename']
+    pagename = request.matchdict['pagename']
     if 'form.submitted' in request.params:
         session = DBSession()
         body = request.params['body']
-        page = Page(name, body)
+        page = Page(pagename, body)
         session.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
-    save_url = request.route_url('add_page', pagename=name)
+                                                      pagename=pagename))
+    save_url = request.route_url('add_page', pagename=pagename)
     page = Page('', '')
     return dict(page=page, save_url=save_url,
                 logged_in=authenticated_userid(request))
@@ -77,17 +77,17 @@ def add_page(request):
 @view_config(route_name='edit_page', renderer='templates/edit.pt',
              permission='edit')
 def edit_page(request):
-    name = request.matchdict['pagename']
+    pagename = request.matchdict['pagename']
     session = DBSession()
-    page = session.query(Page).filter_by(name=name).one()
+    page = session.query(Page).filter_by(name=pagename).one()
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         session.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
+                                                      pagename=pagename))
     return dict(
         page=page,
-        save_url = request.route_url('edit_page', pagename=name),
+        save_url = request.route_url('edit_page', pagename=pagename),
         logged_in=authenticated_userid(request),
         )
 
diff --git a/docs/tutorials/wiki2/src/views/tutorial/views.py b/docs/tutorials/wiki2/src/views/tutorial/views.py
index c2a94a96b..5a9c75a61 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/views.py
@@ -44,27 +44,27 @@ def view_page(request):
 
 @view_config(route_name='add_page', renderer='templates/edit.pt')
 def add_page(request):
-    name = request.matchdict['pagename']
+    pagename = request.matchdict['pagename']
     if 'form.submitted' in request.params:
         body = request.params['body']
-        page = Page(name, body)
+        page = Page(pagename, body)
         DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
-    save_url = request.route_url('add_page', pagename=name)
+                                                      pagename=pagename))
+    save_url = request.route_url('add_page', pagename=pagename)
     page = Page('', '')
     return dict(page=page, save_url=save_url)
 
 @view_config(route_name='edit_page', renderer='templates/edit.pt')
 def edit_page(request):
-    name = request.matchdict['pagename']
-    page = DBSession.query(Page).filter_by(name=name).one()
+    pagename = request.matchdict['pagename']
+    page = DBSession.query(Page).filter_by(name=pagename).one()
     if 'form.submitted' in request.params:
         page.data = request.params['body']
         DBSession.add(page)
         return HTTPFound(location = request.route_url('view_page',
-                                                      pagename=name))
+                                                      pagename=pagename))
     return dict(
         page=page,
-        save_url = request.route_url('edit_page', pagename=name),
+        save_url = request.route_url('edit_page', pagename=pagename),
         )