diff options
| author | Michael Merickel <michael@merickel.org> | 2020-01-03 23:14:53 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2020-01-03 23:14:53 -0600 |
| commit | 828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39 (patch) | |
| tree | be692270de956199b4cfb1eda8a9fc24ceb8374e /tests/pkgs | |
| parent | 7820b922cc1b87147cc60288dff0bbdfd7b5bc8a (diff) | |
| parent | 148cf5138638ce6b1b92b4e13fe1444df9451e34 (diff) | |
| download | pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.gz pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.tar.bz2 pyramid-828e069de5d0c98e6d54cfdbf20b1a8acd1f6b39.zip | |
Merge branch 'master' into security-docs
Diffstat (limited to 'tests/pkgs')
| -rw-r--r-- | tests/pkgs/conflictapp/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/defpermbugapp/__init__.py | 1 | ||||
| -rw-r--r-- | tests/pkgs/eventonly/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/exceptionviewapp/views.py | 4 | ||||
| -rw-r--r-- | tests/pkgs/fixtureapp/views.py | 3 | ||||
| -rw-r--r-- | tests/pkgs/forbiddenapp/__init__.py | 1 | ||||
| -rw-r--r-- | tests/pkgs/forbiddenview/__init__.py | 4 | ||||
| -rw-r--r-- | tests/pkgs/legacysecurityapp/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/notfoundview/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/permbugapp/__init__.py | 3 |
10 files changed, 15 insertions, 9 deletions
diff --git a/tests/pkgs/conflictapp/__init__.py b/tests/pkgs/conflictapp/__init__.py index 840813994..ba3e72fc8 100644 --- a/tests/pkgs/conflictapp/__init__.py +++ b/tests/pkgs/conflictapp/__init__.py @@ -1,6 +1,6 @@ -from pyramid.response import Response from pyramid.authentication import AuthTktAuthenticationPolicy from pyramid.authorization import ACLAuthorizationPolicy +from pyramid.response import Response def aview(request): diff --git a/tests/pkgs/defpermbugapp/__init__.py b/tests/pkgs/defpermbugapp/__init__.py index af78404ae..fe8611870 100644 --- a/tests/pkgs/defpermbugapp/__init__.py +++ b/tests/pkgs/defpermbugapp/__init__.py @@ -1,4 +1,5 @@ from webob import Response + from pyramid.security import NO_PERMISSION_REQUIRED from pyramid.view import view_config diff --git a/tests/pkgs/eventonly/__init__.py b/tests/pkgs/eventonly/__init__.py index c48b539a1..35d83838f 100644 --- a/tests/pkgs/eventonly/__init__.py +++ b/tests/pkgs/eventonly/__init__.py @@ -1,5 +1,5 @@ -from pyramid.view import view_config from pyramid.events import subscriber +from pyramid.view import view_config class Yup(object): diff --git a/tests/pkgs/exceptionviewapp/views.py b/tests/pkgs/exceptionviewapp/views.py index ca2c4fffb..7985d0b94 100644 --- a/tests/pkgs/exceptionviewapp/views.py +++ b/tests/pkgs/exceptionviewapp/views.py @@ -1,7 +1,9 @@ from webob import Response -from .models import AnException + from pyramid.httpexceptions import HTTPBadRequest +from .models import AnException + def no(request): return Response('no') diff --git a/tests/pkgs/fixtureapp/views.py b/tests/pkgs/fixtureapp/views.py index 78df81c6f..c955a220d 100644 --- a/tests/pkgs/fixtureapp/views.py +++ b/tests/pkgs/fixtureapp/views.py @@ -1,5 +1,6 @@ -from zope.interface import Interface from webob import Response +from zope.interface import Interface + from pyramid.httpexceptions import HTTPForbidden diff --git a/tests/pkgs/forbiddenapp/__init__.py b/tests/pkgs/forbiddenapp/__init__.py index 79670dd32..4ae265a96 100644 --- a/tests/pkgs/forbiddenapp/__init__.py +++ b/tests/pkgs/forbiddenapp/__init__.py @@ -1,4 +1,5 @@ from webob import Response + from pyramid.httpexceptions import HTTPForbidden from pyramid.util import bytes_ diff --git a/tests/pkgs/forbiddenview/__init__.py b/tests/pkgs/forbiddenview/__init__.py index 4c78d961c..405869763 100644 --- a/tests/pkgs/forbiddenview/__init__.py +++ b/tests/pkgs/forbiddenview/__init__.py @@ -1,7 +1,7 @@ -from pyramid.view import forbidden_view_config, view_config -from pyramid.response import Response from pyramid.authentication import AuthTktAuthenticationPolicy from pyramid.authorization import ACLAuthorizationPolicy +from pyramid.response import Response +from pyramid.view import forbidden_view_config, view_config @forbidden_view_config(route_name='foo') diff --git a/tests/pkgs/legacysecurityapp/__init__.py b/tests/pkgs/legacysecurityapp/__init__.py index 12fb6104e..abfef1cc5 100644 --- a/tests/pkgs/legacysecurityapp/__init__.py +++ b/tests/pkgs/legacysecurityapp/__init__.py @@ -1,5 +1,5 @@ -from pyramid.response import Response from pyramid.authentication import RemoteUserAuthenticationPolicy +from pyramid.response import Response from pyramid.security import Allowed, Denied diff --git a/tests/pkgs/notfoundview/__init__.py b/tests/pkgs/notfoundview/__init__.py index f606ec671..0eec3192c 100644 --- a/tests/pkgs/notfoundview/__init__.py +++ b/tests/pkgs/notfoundview/__init__.py @@ -1,5 +1,5 @@ -from pyramid.view import notfound_view_config, view_config from pyramid.response import Response +from pyramid.view import notfound_view_config, view_config @notfound_view_config(route_name='foo', append_slash=True) diff --git a/tests/pkgs/permbugapp/__init__.py b/tests/pkgs/permbugapp/__init__.py index 72b5d9c17..594acc8d6 100644 --- a/tests/pkgs/permbugapp/__init__.py +++ b/tests/pkgs/permbugapp/__init__.py @@ -1,6 +1,7 @@ from html import escape -from pyramid.security import view_execution_permitted + from pyramid.response import Response +from pyramid.security import view_execution_permitted def x_view(request): # pragma: no cover |