summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2020-01-17 16:09:27 -0600
committerGitHub <noreply@github.com>2020-01-17 16:09:27 -0600
commita71df99b57e88788cf9ce3a78fc005f309033bbd (patch)
tree56668260a48bef6b194a735de947ee59fd9429f6 /docs/quick_tutorial
parent03d3bbd2791918a844da49eb4449b4953b83a31b (diff)
parent592cadd9c20ce410d9ab7b9a748ec59dff001f65 (diff)
downloadpyramid-a71df99b57e88788cf9ce3a78fc005f309033bbd.tar.gz
pyramid-a71df99b57e88788cf9ce3a78fc005f309033bbd.tar.bz2
pyramid-a71df99b57e88788cf9ce3a78fc005f309033bbd.zip
Merge pull request #3563 from mmerickel/move-acl-security-to-authorization
Move acl security to authorization
Diffstat (limited to 'docs/quick_tutorial')
-rw-r--r--docs/quick_tutorial/authorization/tutorial/resources.py4
-rw-r--r--docs/quick_tutorial/authorization/tutorial/security.py7
-rw-r--r--docs/quick_tutorial/authorization/tutorial/views.py4
-rw-r--r--docs/quick_tutorial/databases/tutorial/models.py2
4 files changed, 10 insertions, 7 deletions
diff --git a/docs/quick_tutorial/authorization/tutorial/resources.py b/docs/quick_tutorial/authorization/tutorial/resources.py
index 0cb656f12..b125cf083 100644
--- a/docs/quick_tutorial/authorization/tutorial/resources.py
+++ b/docs/quick_tutorial/authorization/tutorial/resources.py
@@ -1,4 +1,4 @@
-from pyramid.security import Allow, Everyone
+from pyramid.authorization import Allow, Everyone
class Root(object):
@@ -6,4 +6,4 @@ class Root(object):
(Allow, 'group:editors', 'edit')]
def __init__(self, request):
- pass \ No newline at end of file
+ pass
diff --git a/docs/quick_tutorial/authorization/tutorial/security.py b/docs/quick_tutorial/authorization/tutorial/security.py
index 5b3e04a5f..53e3536fc 100644
--- a/docs/quick_tutorial/authorization/tutorial/security.py
+++ b/docs/quick_tutorial/authorization/tutorial/security.py
@@ -1,7 +1,10 @@
import bcrypt
from pyramid.authentication import AuthTktCookieHelper
-from pyramid.authorization import ACLHelper
-from pyramid.security import Authenticated, Everyone
+from pyramid.authorization import (
+ ACLHelper,
+ Authenticated,
+ Everyone,
+)
def hash_password(pw):
diff --git a/docs/quick_tutorial/authorization/tutorial/views.py b/docs/quick_tutorial/authorization/tutorial/views.py
index 3876efb1c..b9c828086 100644
--- a/docs/quick_tutorial/authorization/tutorial/views.py
+++ b/docs/quick_tutorial/authorization/tutorial/views.py
@@ -2,13 +2,13 @@ from pyramid.httpexceptions import HTTPFound
from pyramid.security import (
remember,
forget,
- )
+)
from pyramid.view import (
view_config,
view_defaults,
forbidden_view_config
- )
+)
from .security import (
USERS,
diff --git a/docs/quick_tutorial/databases/tutorial/models.py b/docs/quick_tutorial/databases/tutorial/models.py
index 8e6649d49..bbfd480bb 100644
--- a/docs/quick_tutorial/databases/tutorial/models.py
+++ b/docs/quick_tutorial/databases/tutorial/models.py
@@ -1,4 +1,4 @@
-from pyramid.security import Allow, Everyone
+from pyramid.authorization import Allow, Everyone
from sqlalchemy import (
Column,