From 675e0d4cf01840740490c03a2e3704b0b7d98de3 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 30 Oct 2013 20:24:34 -0400
Subject: convert remember/forget to request-method-based

---
 docs/quick_tutorial/authentication/tutorial/views.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'docs/quick_tutorial/authentication/tutorial')

diff --git a/docs/quick_tutorial/authentication/tutorial/views.py b/docs/quick_tutorial/authentication/tutorial/views.py
index 3038b6d9b..240a23d3e 100644
--- a/docs/quick_tutorial/authentication/tutorial/views.py
+++ b/docs/quick_tutorial/authentication/tutorial/views.py
@@ -1,9 +1,4 @@
 from pyramid.httpexceptions import HTTPFound
-from pyramid.security import (
-    remember,
-    forget,
-    authenticated_userid
-    )
 from pyramid.view import (
     view_config,
     view_defaults
@@ -16,7 +11,7 @@ from .security import USERS
 class TutorialViews:
     def __init__(self, request):
         self.request = request
-        self.logged_in = authenticated_userid(request)
+        self.logged_in = request.authenticated_userid
 
     @view_config(route_name='home')
     def home(self):
@@ -41,9 +36,8 @@ class TutorialViews:
             login = request.params['login']
             password = request.params['password']
             if USERS.get(login) == password:
-                headers = remember(request, login)
-                return HTTPFound(location=came_from,
-                                 headers=headers)
+                request.remember_userid(login)
+                return HTTPFound(location=came_from)
             message = 'Failed login'
 
         return dict(
@@ -58,7 +52,6 @@ class TutorialViews:
     @view_config(route_name='logout')
     def logout(self):
         request = self.request
-        headers = forget(request)
+        request.forget_userid()
         url = request.route_url('home')
-        return HTTPFound(location=url,
-                         headers=headers)
+        return HTTPFound(location=url)
-- 
cgit v1.2.3


From 0dcd56c2c30863c6683c0cf442aa73dfdcd11b13 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 9 Nov 2013 17:11:16 -0500
Subject: undeprecate remember/forget functions and remove
 remember_userid/forget_userid methods from request

---
 docs/quick_tutorial/authentication/tutorial/views.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'docs/quick_tutorial/authentication/tutorial')

diff --git a/docs/quick_tutorial/authentication/tutorial/views.py b/docs/quick_tutorial/authentication/tutorial/views.py
index 240a23d3e..ab46eb2dd 100644
--- a/docs/quick_tutorial/authentication/tutorial/views.py
+++ b/docs/quick_tutorial/authentication/tutorial/views.py
@@ -1,4 +1,9 @@
 from pyramid.httpexceptions import HTTPFound
+from pyramid.security import (
+    remember,
+    forget,
+    )
+
 from pyramid.view import (
     view_config,
     view_defaults
@@ -36,8 +41,9 @@ class TutorialViews:
             login = request.params['login']
             password = request.params['password']
             if USERS.get(login) == password:
-                request.remember_userid(login)
-                return HTTPFound(location=came_from)
+                headers = remember(request, login)
+                return HTTPFound(location=came_from,
+                                 headers=headers)
             message = 'Failed login'
 
         return dict(
@@ -52,6 +58,7 @@ class TutorialViews:
     @view_config(route_name='logout')
     def logout(self):
         request = self.request
-        request.forget_userid()
+        headers = forget(request)
         url = request.route_url('home')
-        return HTTPFound(location=url)
+        return HTTPFound(location=url,
+                         headers=headers)
-- 
cgit v1.2.3