- Remove "context" argument from ``effective_principals`` and

  ``authenticated_userid`` function APIs in ``repoze.bfg.security``,
  effectively a doing reversion to 0.8 and before behavior.  Both
  functions now again accept only the ``request`` parameter.

3 files changed, 7 insertions, 6 deletions

diff --git a/docs/tutorials/bfgwiki/authorization.rst b/docs/tutorials/bfgwiki/authorization.rst
index d69bec8a7..437cb9c74 100644
--- a/docs/tutorials/bfgwiki/authorization.rst
+++ b/docs/tutorials/bfgwiki/authorization.rst
@@ -71,7 +71,7 @@ into its template.  We'll add something like this to each view body:
 .. code-block:: python
    :linenos:
 
-   logged_in = authenticated_user(context, request)
+   logged_in = authenticated_user(request)
 
 We'll then change the return value of ``render_template_to_response``
 to pass the `resulting `logged_in`` value to the template, e.g.:
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py
index c4c595e81..5fc94d480 100644
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py
+++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/login.py
@@ -1,11 +1,12 @@
 from webob.exc import HTTPFound
 
 from repoze.bfg.chameleon_zpt import render_template_to_response
-from repoze.bfg.security import remember
-from repoze.bfg.security import forget
 from repoze.bfg.view import bfg_view
 from repoze.bfg.url import model_url
 
+from repoze.bfg.security import remember
+from repoze.bfg.security import forget
+
 from tutorial.models import Wiki
 from tutorial.run import USERS
 
@@ -20,7 +21,7 @@ def login(context, request):
         login = request.params['login']
         password = request.params['password']
         if USERS.get(login) == password:
-            headers = remember(context, request, login)
+            headers = remember(request, login)
             return HTTPFound(location = came_from,
                              headers = headers)
         message = 'Failed login'
@@ -37,7 +38,7 @@ def login(context, request):
     
 @bfg_view(for_=Wiki, name='logout')
 def logout(context, request):
-    headers = forget(context, request)
+    headers = forget(request)
     return HTTPFound(location = model_url(context, request),
                      headers = headers)
     
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py
index 1d3e57de3..c8c02e57e 100644
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py
@@ -44,7 +44,7 @@ def view_page(context, request):
     content = wikiwords.sub(check, content)
     edit_url = model_url(context, request, 'edit_page')
 
-    logged_in = authenticated_userid(context, request)
+    logged_in = authenticated_userid(request)
 
     return render_template_to_response('templates/view.pt',
                                        request = request,