summaryrefslogtreecommitdiff
path: root/tests/pkgs/conflictapp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/pkgs/conflictapp')
-rw-r--r--tests/pkgs/conflictapp/__init__.py9
-rw-r--r--tests/pkgs/conflictapp/included.py5
2 files changed, 11 insertions, 3 deletions
diff --git a/tests/pkgs/conflictapp/__init__.py b/tests/pkgs/conflictapp/__init__.py
index d85aa0e1e..840813994 100644
--- a/tests/pkgs/conflictapp/__init__.py
+++ b/tests/pkgs/conflictapp/__init__.py
@@ -2,15 +2,19 @@ from pyramid.response import Response
from pyramid.authentication import AuthTktAuthenticationPolicy
from pyramid.authorization import ACLAuthorizationPolicy
+
def aview(request):
return Response('a view')
+
def routeview(request):
return Response('route view')
+
def protectedview(request):
return Response('protected view')
+
def includeme(config):
# purposely sorta-randomly ordered (route comes after view naming it,
# authz comes after views)
@@ -18,7 +22,8 @@ def includeme(config):
config.add_view(protectedview, name='protected', permission='view')
config.add_view(routeview, route_name='aroute')
config.add_route('aroute', '/route')
- config.set_authentication_policy(AuthTktAuthenticationPolicy(
- 'seekri1t', hashalg='sha512'))
+ config.set_authentication_policy(
+ AuthTktAuthenticationPolicy('seekri1t', hashalg='sha512')
+ )
config.set_authorization_policy(ACLAuthorizationPolicy())
config.include('tests.pkgs.conflictapp.included')
diff --git a/tests/pkgs/conflictapp/included.py b/tests/pkgs/conflictapp/included.py
index 0b76fb2bc..5f483ff81 100644
--- a/tests/pkgs/conflictapp/included.py
+++ b/tests/pkgs/conflictapp/included.py
@@ -1,6 +1,9 @@
from webob import Response
-def bview(request): return Response('b view')
+
+def bview(request):
+ return Response('b view')
+
def includeme(config):
config.add_view(bview)