Rejigger tutorial in the face of request-only default views.

4 files changed, 8 insertions, 8 deletions

diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
index 28c3e05b4..b5a2a836c 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/login.py
@@ -9,7 +9,7 @@ from repoze.bfg.security import forget
 
 from tutorial.run import USERS
 
-def login(context, request):
+def login(request):
     login_url = url_for('login')
     referrer = request.environ.get('HTTP_REFERER', '/')
     if referrer == login_url:
@@ -37,7 +37,7 @@ def login(context, request):
         request  =request,
         )
     
-def logout(context, request):
+def logout(request):
     headers = forget(request)
     return HTTPFound(location = url_for('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 4bcaae185..fd6c410e2 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py
@@ -18,10 +18,10 @@ wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
 static_view = static('templates/static')
 
-def view_wiki(context, request):
+def view_wiki(request):
     return HTTPFound(location = url_for('view_page', pagename='FrontPage'))
 
-def view_page(context, request):
+def view_page(request):
     pagename = request.matchdict['pagename']
     session = DBSession()
     page = session.query(Page).filter_by(name=pagename).one()
@@ -47,7 +47,7 @@ def view_page(context, request):
                                        logged_in = logged_in,
                                        edit_url = edit_url)
 
-def add_page(context, request):
+def add_page(request):
     name = request.matchdict['pagename']
     if 'form.submitted' in request.params:
         session = DBSession()
@@ -64,7 +64,7 @@ def add_page(context, request):
                                        logged_in = logged_in,
                                        save_url = save_url)
     
-def edit_page(context, request):
+def edit_page(request):
     name = request.matchdict['pagename']
     session = DBSession()
     page = session.query(Page).filter_by(name=name).one()
diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py
index 375293b02..f101b2742 100644
--- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py
@@ -6,7 +6,7 @@ from tutorial.models import Model
 
 static_view = static('templates/static')
 
-def my_view(context, request):
+def my_view(request):
     dbsession = DBSession()
     root = dbsession.query(Model).filter(Model.name==u'root').first()
     return render_template_to_response('templates/mytemplate.pt',
diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/views.py b/docs/tutorials/bfgwiki2/src/models/tutorial/views.py
index 375293b02..f101b2742 100644
--- a/docs/tutorials/bfgwiki2/src/models/tutorial/views.py
+++ b/docs/tutorials/bfgwiki2/src/models/tutorial/views.py
@@ -6,7 +6,7 @@ from tutorial.models import Model
 
 static_view = static('templates/static')
 
-def my_view(context, request):
+def my_view(request):
     dbsession = DBSession()
     root = dbsession.query(Model).filter(Model.name==u'root').first()
     return render_template_to_response('templates/mytemplate.pt',