summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-10-30 20:24:34 -0400
committerChris McDonough <chrism@plope.com>2013-10-30 20:24:34 -0400
commit675e0d4cf01840740490c03a2e3704b0b7d98de3 (patch)
treefd361219eba20d57acdf5887dac35347de1fe14f
parenta91c19837f5ce579ce2a5bf68ddee30cfaebe034 (diff)
downloadpyramid-675e0d4cf01840740490c03a2e3704b0b7d98de3.tar.gz
pyramid-675e0d4cf01840740490c03a2e3704b0b7d98de3.tar.bz2
pyramid-675e0d4cf01840740490c03a2e3704b0b7d98de3.zip
convert remember/forget to request-method-based
-rw-r--r--docs/quick_tutorial/authentication/tutorial/views.py17
-rw-r--r--docs/quick_tutorial/authorization/tutorial/views.py17
2 files changed, 10 insertions, 24 deletions
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)
diff --git a/docs/quick_tutorial/authorization/tutorial/views.py b/docs/quick_tutorial/authorization/tutorial/views.py
index 92c1946ba..2ce2c37b4 100644
--- a/docs/quick_tutorial/authorization/tutorial/views.py
+++ b/docs/quick_tutorial/authorization/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,
@@ -17,7 +12,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):
@@ -43,9 +38,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(
@@ -60,7 +54,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)