Update tutorials with new callback API.

4 files changed, 16 insertions, 15 deletions

diff --git a/docs/tutorials/bfgwiki/authorization.rst b/docs/tutorials/bfgwiki/authorization.rst
index bd4e80206..e493852ec 100644
--- a/docs/tutorials/bfgwiki/authorization.rst
+++ b/docs/tutorials/bfgwiki/authorization.rst
@@ -29,12 +29,13 @@ the policy, and pass it as the ``authentication_policy`` argument to
 the ``make_app`` function.  The first positional argument of an
 ``AuthTktAuthenticationPolicy`` is a secret used to encrypt cookie
 data.  Its second argument ("callback") should be a callable that
-accepts a userid.  If the userid exists in the system, the callback
-should return a sequence of group identifiers (or an empty sequence if
-the user isn't a member of any groups).  If the userid *does not*
-exist in the system, the callback should return ``None``.  We'll use
-"dummy" data to represent user and groups sources.  When we're done,
-your application's ``run.py`` will look like this.
+accepts a userid ana a request.  If the userid exists in the system,
+the callback should return a sequence of group identifiers (or an
+empty sequence if the user isn't a member of any groups).  If the
+userid *does not* exist in the system, the callback should return
+``None``.  We'll use "dummy" data to represent user and groups
+sources.  When we're done, your application's ``run.py`` will look
+like this.
 
 .. literalinclude:: src/authorization/tutorial/run.py
    :linenos:
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
index a5d0cf39c..32faa5899 100644
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
+++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/run.py
@@ -25,7 +25,7 @@ USERS = {'editor':'editor',
           'viewer':'viewer'}
 GROUPS = {'editor':['group.editors']}
 
-def groupfinder(userid):
+def groupfinder(userid, request):
     if userid in USERS:
         return GROUPS.get(userid, [])
 
diff --git a/docs/tutorials/bfgwiki2/authorization.rst b/docs/tutorials/bfgwiki2/authorization.rst
index 4ee4e6ac4..f3f5a6f95 100644
--- a/docs/tutorials/bfgwiki2/authorization.rst
+++ b/docs/tutorials/bfgwiki2/authorization.rst
@@ -75,13 +75,13 @@ the policy, and pass it as the ``authentication_policy`` argument to
 the ``make_app`` function.  The first positional argument of an
 ``AuthTktAuthenticationPolicy`` is a secret used to encrypt cookie
 data.  Its second argument ("callback") should be a callable that
-accepts a userid (usually a string).  If the userid exists in the
-system, the callback should return a sequence of group identifiers (or
-an empty sequence if the user isn't a member of any groups).  If the
-userid *does not* exist in the system, the callback should return
-``None``.  We'll use "dummy" data to represent user and groups sources
-within ``run.py``.  In a "real" application this information would
-almost certainly come from some database.
+accepts a userid (usually a string) and a request object.  If the
+userid exists in the system, the callback should return a sequence of
+group identifiers (or an empty sequence if the user isn't a member of
+any groups).  If the userid *does not* exist in the system, the
+callback should return ``None``.  We'll use "dummy" data to represent
+user and groups sources within ``run.py``.  In a "real" application
+this information would almost certainly come from some database.
 
 We'll also use the opportunity to pass the ``RootFactory`` we created
 in the step above in as the first argument to ``make_app``.  When
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py
index 698ba96b9..301f00312 100644
--- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py
+++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/run.py
@@ -35,7 +35,7 @@ USERS = {'editor':'editor',
           'viewer':'viewer'}
 GROUPS = {'editor':['group.editors']}
 
-def groupfinder(userid):
+def groupfinder(userid, request):
     if userid in USERS:
         return GROUPS.get(userid, [])