summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src
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/tutorials/wiki2/src
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/tutorials/wiki2/src')
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/routes.py8
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/security.py8
-rw-r--r--docs/tutorials/wiki2/src/tests/tutorial/routes.py2
-rw-r--r--docs/tutorials/wiki2/src/tests/tutorial/security.py8
4 files changed, 13 insertions, 13 deletions
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/routes.py b/docs/tutorials/wiki2/src/authorization/tutorial/routes.py
index f016d7541..f7bbe6011 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/routes.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/routes.py
@@ -1,11 +1,11 @@
+from pyramid.authorization import (
+ Allow,
+ Everyone,
+)
from pyramid.httpexceptions import (
HTTPNotFound,
HTTPSeeOther,
)
-from pyramid.security import (
- Allow,
- Everyone,
-)
from . import models
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/security.py b/docs/tutorials/wiki2/src/authorization/tutorial/security.py
index 7a99fb9e9..5a9d4bbf2 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/security.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/security.py
@@ -1,11 +1,11 @@
from pyramid.authentication import AuthTktCookieHelper
-from pyramid.authorization import ACLHelper
-from pyramid.csrf import CookieCSRFStoragePolicy
-from pyramid.request import RequestLocalCache
-from pyramid.security import (
+from pyramid.authorization import (
+ ACLHelper,
Authenticated,
Everyone,
)
+from pyramid.csrf import CookieCSRFStoragePolicy
+from pyramid.request import RequestLocalCache
from . import models
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/routes.py b/docs/tutorials/wiki2/src/tests/tutorial/routes.py
index f016d7541..7070884d3 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/routes.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/routes.py
@@ -2,7 +2,7 @@ from pyramid.httpexceptions import (
HTTPNotFound,
HTTPSeeOther,
)
-from pyramid.security import (
+from pyramid.authorization import (
Allow,
Everyone,
)
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/security.py b/docs/tutorials/wiki2/src/tests/tutorial/security.py
index 7a99fb9e9..5a9d4bbf2 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/security.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/security.py
@@ -1,11 +1,11 @@
from pyramid.authentication import AuthTktCookieHelper
-from pyramid.authorization import ACLHelper
-from pyramid.csrf import CookieCSRFStoragePolicy
-from pyramid.request import RequestLocalCache
-from pyramid.security import (
+from pyramid.authorization import (
+ ACLHelper,
Authenticated,
Everyone,
)
+from pyramid.csrf import CookieCSRFStoragePolicy
+from pyramid.request import RequestLocalCache
from . import models