From c226b1ae080aa7d19c47626b07fe6d8ef6bbba9e Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sun, 8 Apr 2012 07:34:21 -0500
Subject: Normalize Authorization in both tutorials 3

- Sync content in Adding Authentication and
  Authorization policies, Add permission
  declarations sections
- Added mising permission=view in SQL tutorial
- Moved __init__.py listing to Seeing our changes
---
 docs/tutorials/wiki/src/authorization/tutorial/views.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'docs/tutorials/wiki/src/authorization')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py
index fcbe6fe25..3899e4d77 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views.py
@@ -20,12 +20,13 @@ from .models import Page
 # regular expression used to find WikiWords
 wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
-@view_config(context='.models.Wiki', permission='view')
+@view_config(context='.models.Wiki',
+             permission='view')
 def view_wiki(context, request):
     return HTTPFound(location=request.resource_url(context, 'FrontPage'))
 
-@view_config(context='.models.Page',
-             renderer='templates/view.pt', permission='view')
+@view_config(context='.models.Page', renderer='templates/view.pt',
+             permission='view')
 def view_page(context, request):
     wiki = context.__parent__
 
-- 
cgit v1.2.3


From fad5003b4f0cba6217c23e2f3aa40bf7cb4f8200 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sun, 8 Apr 2012 09:13:06 -0500
Subject: Normalize Authorization in both tutorials 4

- Sync content of Add login and logout views,
  Add the login.pt template, Return a logged_in
  flag, Add a logout link sections
- Normalize sections of views.py
---
 docs/tutorials/wiki/src/authorization/tutorial/views.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'docs/tutorials/wiki/src/authorization')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/views.py b/docs/tutorials/wiki/src/authorization/tutorial/views.py
index 3899e4d77..21f12b31d 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/views.py
@@ -9,9 +9,9 @@ from pyramid.view import (
     )
 
 from pyramid.security import (
-    authenticated_userid,
     remember,
     forget,
+    authenticated_userid,
     )
 
 from .security import USERS
@@ -44,10 +44,8 @@ def view_page(context, request):
     content = wikiwords.sub(check, content)
     edit_url = request.resource_url(context, 'edit_page')
 
-    logged_in = authenticated_userid(request)
-
     return dict(page = context, content = content, edit_url = edit_url,
-                logged_in = logged_in)
+                logged_in = authenticated_userid(request))
 
 @view_config(name='add_page', context='.models.Wiki',
              renderer='templates/edit.pt',
@@ -66,9 +64,8 @@ def add_page(context, request):
     page.__name__ = name
     page.__parent__ = context
 
-    logged_in = authenticated_userid(request)
-
-    return dict(page = page, save_url = save_url, logged_in = logged_in)
+    return dict(page = page, save_url = save_url,
+                logged_in = authenticated_userid(request))
 
 @view_config(name='edit_page', context='.models.Page',
              renderer='templates/edit.pt',
@@ -78,11 +75,9 @@ def edit_page(context, request):
         context.data = request.params['body']
         return HTTPFound(location = request.resource_url(context))
 
-    logged_in = authenticated_userid(request)
-
     return dict(page = context,
                 save_url = request.resource_url(context, 'edit_page'),
-                logged_in = logged_in)
+                logged_in = authenticated_userid(request))
 
 @view_config(context='.models.Wiki', name='login',
              renderer='templates/login.pt')
-- 
cgit v1.2.3


From 6d46a771ab8af1cd0dd61de0a99f898698c4a961 Mon Sep 17 00:00:00 2001
From: Patricio Paez <pp@pp.com.mx>
Date: Sun, 8 Apr 2012 09:50:19 -0500
Subject: Final details

- Normalize the Seeing our changes section
- Changed import to recommended style
---
 docs/tutorials/wiki/src/authorization/tutorial/models.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'docs/tutorials/wiki/src/authorization')

diff --git a/docs/tutorials/wiki/src/authorization/tutorial/models.py b/docs/tutorials/wiki/src/authorization/tutorial/models.py
index 0a31c38be..582ff0d7e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/models.py
+++ b/docs/tutorials/wiki/src/authorization/tutorial/models.py
@@ -1,8 +1,10 @@
 from persistent import Persistent
 from persistent.mapping import PersistentMapping
 
-from pyramid.security import Allow
-from pyramid.security import Everyone
+from pyramid.security import (
+    Allow,
+    Everyone,
+    )
 
 class Wiki(PersistentMapping):
     __name__ = None
-- 
cgit v1.2.3