- The matchdict related to the matching of a Routes route is available

  on the request as the ``matchdict`` attribute:
  ``request.matchdict``.  If no route matched, this attribute will be
  None.

6 files changed, 18 insertions, 16 deletions

diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml
index ff0125f83..fd8c8484c 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml
@@ -6,6 +6,11 @@
   <subscriber for="repoze.bfg.interfaces.INewRequest"
     handler=".run.handle_teardown"/>
 
+  <view 
+    name="static"
+    view=".views.static_view"
+    />
+
   <route
      path="login"
      name="login"
@@ -18,11 +23,6 @@
      view=".login.logout"
      />
 
-  <route path="static/*subpath"
-    name="static"
-    view=".views.static_view"
-    />
-
   <route
     path=""
     name="view_wiki"
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
index b38a9489e..4bcaae185 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
@@ -22,8 +22,9 @@ def view_wiki(context, request):
     return HTTPFound(location = url_for('view_page', pagename='FrontPage'))
 
 def view_page(context, request):
+    pagename = request.matchdict['pagename']
     session = DBSession()
-    page = session.query(Page).filter_by(name=context.pagename).one()
+    page = session.query(Page).filter_by(name=pagename).one()
 
     def check(match):
         word = match.group(1)
@@ -37,7 +38,7 @@ def view_page(context, request):
 
     content = publish_parts(page.data, writer_name='html')['html_body']
     content = wikiwords.sub(check, content)
-    edit_url = url_for('edit_page', pagename=context.pagename)
+    edit_url = url_for('edit_page', pagename=pagename)
     logged_in = authenticated_userid(request)
     return render_template_to_response('templates/view.pt',
                                        request = request,
@@ -47,7 +48,7 @@ def view_page(context, request):
                                        edit_url = edit_url)
 
 def add_page(context, request):
-    name = context.pagename
+    name = request.matchdict['pagename']
     if 'form.submitted' in request.params:
         session = DBSession()
         body = request.params['body']
@@ -64,7 +65,7 @@ def add_page(context, request):
                                        save_url = save_url)
     
 def edit_page(context, request):
-    name = context.pagename
+    name = request.matchdict['pagename']
     session = DBSession()
     page = session.query(Page).filter_by(name=name).one()
     if 'form.submitted' in request.params:
diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml
index 4858c47fd..4d1a16612 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml
@@ -11,7 +11,7 @@
     view=".views.my_view"
     />
 
-  <route path="static/*subpath"
+  <view 
     name="static"
     view=".views.static_view"
     />
diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml
index 4858c47fd..4d1a16612 100644
--- a/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml
@@ -11,7 +11,7 @@
     view=".views.my_view"
     />
 
-  <route path="static/*subpath"
+  <view 
     name="static"
     view=".views.static_view"
     />
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml
index 70c3d4d9a..9d936c6d3 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml
@@ -6,7 +6,7 @@
   <subscriber for="repoze.bfg.interfaces.INewRequest"
     handler=".run.handle_teardown"/>
 
-  <route path="static/*subpath"
+  <view 
     name="static"
     view=".views.static_view"
     />
diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py
index c4e91dda1..f81fbf2af 100644
--- a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py
@@ -21,8 +21,9 @@ def view_wiki(context, request):
     return HTTPFound(location = url_for('view_page', pagename='FrontPage'))
 
 def view_page(context, request):
+    matchdict = request.matchdict
     session = DBSession()
-    page = session.query(Page).filter_by(name=context.pagename).one()
+    page = session.query(Page).filter_by(name=matchdict['pagename']).one()
 
     def check(match):
         word = match.group(1)
@@ -36,7 +37,7 @@ def view_page(context, request):
 
     content = publish_parts(page.data, writer_name='html')['html_body']
     content = wikiwords.sub(check, content)
-    edit_url = url_for('edit_page', pagename=context.pagename)
+    edit_url = url_for('edit_page', pagename=matchdict['pagename'])
     return render_template_to_response('templates/view.pt',
                                        request = request,
                                        page = page,
@@ -44,7 +45,7 @@ def view_page(context, request):
                                        edit_url = edit_url)
 
 def add_page(context, request):
-    name = context.pagename
+    name = request.matchdict['pagename']
     if 'form.submitted' in request.params:
         session = DBSession()
         body = request.params['body']
@@ -59,7 +60,7 @@ def add_page(context, request):
                                        save_url = save_url)
     
 def edit_page(context, request):
-    name = context.pagename
+    name = request.matchdict['pagename']
     session = DBSession()
     page = session.query(Page).filter_by(name=name).one()
     if 'form.submitted' in request.params: