isort

54 files changed, 87 insertions, 65 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
diff --git a/tests/test_asset.py b/tests/test_asset.py
index 55a3c0336..84c30b33f 100644
--- a/tests/test_asset.py
+++ b/tests/test_asset.py
@@ -1,5 +1,5 @@
-import unittest
 import os
+import unittest
 
 here = os.path.abspath(os.path.dirname(__file__))
 
diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index e0f5a7963..ec3aef4ef 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -1,8 +1,9 @@
 from http.cookies import SimpleCookie
 import unittest
 import warnings
+
 from pyramid import testing
-from pyramid.util import text_, bytes_
+from pyramid.util import bytes_, text_
 
 
 class TestCallbackAuthenticationPolicyDebugging(unittest.TestCase):
diff --git a/tests/test_config/__init__.py b/tests/test_config/__init__.py
index ac1f19667..99677ebc5 100644
--- a/tests/test_config/__init__.py
+++ b/tests/test_config/__init__.py
@@ -1,7 +1,6 @@
 # package
 from functools import partial
-from zope.interface import implementer
-from zope.interface import Interface
+from zope.interface import Interface, implementer
 
 
 class IFactory(Interface):
diff --git a/tests/test_config/pkgs/scannable/__init__.py b/tests/test_config/pkgs/scannable/__init__.py
index 585f4357b..e0042a5cc 100644
--- a/tests/test_config/pkgs/scannable/__init__.py
+++ b/tests/test_config/pkgs/scannable/__init__.py
@@ -1,5 +1,5 @@
-from pyramid.view import view_config
 from pyramid.renderers import null_renderer
+from pyramid.view import view_config
 
 
 @view_config(renderer=null_renderer)
diff --git a/tests/test_config/pkgs/scannable/another.py b/tests/test_config/pkgs/scannable/another.py
index e8b71e5e3..31e7f5128 100644
--- a/tests/test_config/pkgs/scannable/another.py
+++ b/tests/test_config/pkgs/scannable/another.py
@@ -1,5 +1,5 @@
-from pyramid.view import view_config
 from pyramid.renderers import null_renderer
+from pyramid.view import view_config
 
 
 @view_config(name='another', renderer=null_renderer)
diff --git a/tests/test_config/pkgs/scannable/pod/notinit.py b/tests/test_config/pkgs/scannable/pod/notinit.py
index 03c93857f..bb1412722 100644
--- a/tests/test_config/pkgs/scannable/pod/notinit.py
+++ b/tests/test_config/pkgs/scannable/pod/notinit.py
@@ -1,5 +1,5 @@
-from pyramid.view import view_config
 from pyramid.renderers import null_renderer
+from pyramid.view import view_config
 
 
 @view_config(name='pod_notinit', renderer=null_renderer)
diff --git a/tests/test_config/pkgs/scannable/subpackage/__init__.py b/tests/test_config/pkgs/scannable/subpackage/__init__.py
index f89ca33f7..c22d48150 100644
--- a/tests/test_config/pkgs/scannable/subpackage/__init__.py
+++ b/tests/test_config/pkgs/scannable/subpackage/__init__.py
@@ -1,5 +1,5 @@
-from pyramid.view import view_config
 from pyramid.renderers import null_renderer
+from pyramid.view import view_config
 
 
 @view_config(name='subpackage_init', renderer=null_renderer)
diff --git a/tests/test_config/pkgs/scannable/subpackage/notinit.py b/tests/test_config/pkgs/scannable/subpackage/notinit.py
index 65c2a4929..10c35ab7b 100644
--- a/tests/test_config/pkgs/scannable/subpackage/notinit.py
+++ b/tests/test_config/pkgs/scannable/subpackage/notinit.py
@@ -1,5 +1,5 @@
-from pyramid.view import view_config
 from pyramid.renderers import null_renderer
+from pyramid.view import view_config
 
 
 @view_config(name='subpackage_notinit', renderer=null_renderer)
diff --git a/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py b/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py
index ec4bab818..a2fcf2af8 100644
--- a/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py
+++ b/tests/test_config/pkgs/scannable/subpackage/subsubpackage/__init__.py
@@ -1,5 +1,5 @@
-from pyramid.view import view_config
 from pyramid.renderers import null_renderer
+from pyramid.view import view_config
 
 
 @view_config(name='subsubpackage_init', renderer=null_renderer)
diff --git a/tests/test_config/test_actions.py b/tests/test_config/test_actions.py
index a72d0d7b1..aa86f3792 100644
--- a/tests/test_config/test_actions.py
+++ b/tests/test_config/test_actions.py
@@ -1,8 +1,9 @@
 import unittest
 
-from pyramid.exceptions import ConfigurationConflictError
-from pyramid.exceptions import ConfigurationExecutionError
-
+from pyramid.exceptions import (
+    ConfigurationConflictError,
+    ConfigurationExecutionError,
+)
 from pyramid.interfaces import IRequest
 
 
diff --git a/tests/test_config/test_assets.py b/tests/test_config/test_assets.py
index 875846dbd..cfd786c5d 100644
--- a/tests/test_config/test_assets.py
+++ b/tests/test_config/test_assets.py
@@ -1,5 +1,6 @@
 import os.path
 import unittest
+
 from pyramid.testing import cleanUp
 
 # we use this folder
diff --git a/tests/test_config/test_init.py b/tests/test_config/test_init.py
index 5ca33178a..ebcd78bb6 100644
--- a/tests/test_config/test_init.py
+++ b/tests/test_config/test_init.py
@@ -1,17 +1,20 @@
 import os
 import unittest
 
-from . import dummy_tween_factory
-from . import dummy_include
-from . import dummy_extend
-from . import dummy_extend2
-from . import DummyContext
-
-from pyramid.exceptions import ConfigurationExecutionError
-from pyramid.exceptions import ConfigurationConflictError
-
+from pyramid.exceptions import (
+    ConfigurationConflictError,
+    ConfigurationExecutionError,
+)
 from pyramid.interfaces import IRequest
 
+from . import (
+    DummyContext,
+    dummy_extend,
+    dummy_extend2,
+    dummy_include,
+    dummy_tween_factory,
+)
+
 
 class ConfiguratorTests(unittest.TestCase):
     def _makeOne(self, *arg, **kw):
diff --git a/tests/test_config/test_routes.py b/tests/test_config/test_routes.py
index a75fdd776..bbafa8784 100644
--- a/tests/test_config/test_routes.py
+++ b/tests/test_config/test_routes.py
@@ -1,10 +1,10 @@
 import unittest
 import warnings
 
-from . import dummyfactory
-from . import DummyContext
 from pyramid.util import text_
 
+from . import DummyContext, dummyfactory
+
 
 class RoutesConfiguratorMixinTests(unittest.TestCase):
     def _makeOne(self, *arg, **kw):
diff --git a/tests/test_config/test_security.py b/tests/test_config/test_security.py
index 9a9ea9f7e..6c73ead1e 100644
--- a/tests/test_config/test_security.py
+++ b/tests/test_config/test_security.py
@@ -1,7 +1,6 @@
 import unittest
 
-from pyramid.exceptions import ConfigurationExecutionError
-from pyramid.exceptions import ConfigurationError
+from pyramid.exceptions import ConfigurationError, ConfigurationExecutionError
 
 
 class ConfiguratorSecurityMethodsTests(unittest.TestCase):
diff --git a/tests/test_config/test_testing.py b/tests/test_config/test_testing.py
index efbe28f66..e379e41bc 100644
--- a/tests/test_config/test_testing.py
+++ b/tests/test_config/test_testing.py
@@ -1,8 +1,9 @@
 import unittest
 from zope.interface import implementer
 
-from pyramid.security import SecurityAPIMixin, AuthenticationAPIMixin
+from pyramid.security import AuthenticationAPIMixin, SecurityAPIMixin
 from pyramid.util import text_
+
 from . import IDummy
 
 
diff --git a/tests/test_config/test_tweens.py b/tests/test_config/test_tweens.py
index 805310c9a..ff75461c3 100644
--- a/tests/test_config/test_tweens.py
+++ b/tests/test_config/test_tweens.py
@@ -1,10 +1,9 @@
 import unittest
 
-from . import dummy_tween_factory
-from . import dummy_tween_factory2
-
 from pyramid.exceptions import ConfigurationConflictError
 
+from . import dummy_tween_factory, dummy_tween_factory2
+
 
 class TestTweensConfiguratorMixin(unittest.TestCase):
     def _makeOne(self, *arg, **kw):
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index 353749ed6..3aecc721a 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -4,14 +4,15 @@ import warnings
 from zope.interface import implementer
 
 from pyramid import testing
-from pyramid.exceptions import ConfigurationError
-from pyramid.exceptions import ConfigurationExecutionError
-from pyramid.exceptions import ConfigurationConflictError
-from pyramid.interfaces import IResponse, IRequest, IMultiView
+from pyramid.exceptions import (
+    ConfigurationConflictError,
+    ConfigurationError,
+    ConfigurationExecutionError,
+)
+from pyramid.interfaces import IMultiView, IRequest, IResponse
 from pyramid.util import text_
 
-from . import IDummy
-from . import dummy_view
+from . import IDummy, dummy_view
 
 
 class TestViewsConfigurationMixin(unittest.TestCase):
diff --git a/tests/test_encode.py b/tests/test_encode.py
index 4df08d509..ede6e9050 100644
--- a/tests/test_encode.py
+++ b/tests/test_encode.py
@@ -1,4 +1,5 @@
 import unittest
+
 from pyramid.util import text_
 
 
diff --git a/tests/test_events.py b/tests/test_events.py
index 25ed5fc0d..b344738a3 100644
--- a/tests/test_events.py
+++ b/tests/test_events.py
@@ -1,4 +1,5 @@
 import unittest
+
 from pyramid import testing
 
 
diff --git a/tests/test_i18n.py b/tests/test_i18n.py
index 78891200d..4ac6bd4e2 100644
--- a/tests/test_i18n.py
+++ b/tests/test_i18n.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 import unittest
+
 from pyramid import testing
 
 here = os.path.dirname(__file__)
diff --git a/tests/test_location.py b/tests/test_location.py
index 163bb85aa..86fb8bfa8 100644
--- a/tests/test_location.py
+++ b/tests/test_location.py
@@ -1,5 +1,6 @@
 import unittest
 from zope.interface import implementer
+
 from pyramid.interfaces import ILocation
 
 
diff --git a/tests/test_paster.py b/tests/test_paster.py
index dd53195c7..ef2571471 100644
--- a/tests/test_paster.py
+++ b/tests/test_paster.py
@@ -1,5 +1,6 @@
 import os
 import unittest
+
 from .test_scripts.dummy import DummyLoader
 
 here = os.path.dirname(__file__)
diff --git a/tests/test_path.py b/tests/test_path.py
index da7cd64e1..e9fe94fe2 100644
--- a/tests/test_path.py
+++ b/tests/test_path.py
@@ -1,5 +1,5 @@
-import unittest
 import os
+import unittest
 
 here = os.path.abspath(os.path.dirname(__file__))
 
diff --git a/tests/test_predicates.py b/tests/test_predicates.py
index c0a6c59ec..b0ee65bcf 100644
--- a/tests/test_predicates.py
+++ b/tests/test_predicates.py
@@ -1,7 +1,6 @@
 import unittest
 
 from pyramid import testing
-
 from pyramid.util import text_
 
 
diff --git a/tests/test_registry.py b/tests/test_registry.py
index aee4f0e15..81443ce47 100644
--- a/tests/test_registry.py
+++ b/tests/test_registry.py
@@ -1,6 +1,5 @@
 import unittest
-from zope.interface import Interface
-from zope.interface import implementer
+from zope.interface import Interface, implementer
 
 
 class TestRegistry(unittest.TestCase):
diff --git a/tests/test_request.py b/tests/test_request.py
index 1a10a8509..bbf6aa47c 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -1,8 +1,8 @@
 import unittest
-from pyramid import testing
 
-from pyramid.security import SecurityAPIMixin, AuthenticationAPIMixin
-from pyramid.util import text_, bytes_
+from pyramid import testing
+from pyramid.security import AuthenticationAPIMixin, SecurityAPIMixin
+from pyramid.util import bytes_, text_
 
 
 class TestRequest(unittest.TestCase):
diff --git a/tests/test_response.py b/tests/test_response.py
index b63ccc6b1..4371d867f 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -2,6 +2,7 @@ import io
 import mimetypes
 import os
 import unittest
+
 from pyramid import testing
 
 
diff --git a/tests/test_scripts/dummy.py b/tests/test_scripts/dummy.py
index bb3475d39..4a848e043 100644
--- a/tests/test_scripts/dummy.py
+++ b/tests/test_scripts/dummy.py
@@ -1,4 +1,5 @@
 from zope.interface import implementer
+
 from pyramid.interfaces import IMultiView
 
 
diff --git a/tests/test_scripts/test_prequest.py b/tests/test_scripts/test_prequest.py
index aadde719a..2214f6350 100644
--- a/tests/test_scripts/test_prequest.py
+++ b/tests/test_scripts/test_prequest.py
@@ -1,5 +1,6 @@
 from io import StringIO
 import unittest
+
 from . import dummy
 
 
diff --git a/tests/test_scripts/test_proutes.py b/tests/test_scripts/test_proutes.py
index b5a083272..6ba02a7d4 100644
--- a/tests/test_scripts/test_proutes.py
+++ b/tests/test_scripts/test_proutes.py
@@ -1,5 +1,6 @@
 import os
 import unittest
+
 from . import dummy
 
 
diff --git a/tests/test_scripts/test_pserve.py b/tests/test_scripts/test_pserve.py
index f19ba81df..7bf962f9e 100644
--- a/tests/test_scripts/test_pserve.py
+++ b/tests/test_scripts/test_pserve.py
@@ -1,8 +1,8 @@
 from io import StringIO
 import os
 import unittest
-from . import dummy
 
+from . import dummy
 
 here = os.path.abspath(os.path.dirname(__file__))
 
diff --git a/tests/test_scripts/test_pshell.py b/tests/test_scripts/test_pshell.py
index 6beaacda6..10a9cd593 100644
--- a/tests/test_scripts/test_pshell.py
+++ b/tests/test_scripts/test_pshell.py
@@ -1,5 +1,6 @@
 import os
 import unittest
+
 from . import dummy
 
 
diff --git a/tests/test_scripts/test_ptweens.py b/tests/test_scripts/test_ptweens.py
index ee50887f6..808bc64b6 100644
--- a/tests/test_scripts/test_ptweens.py
+++ b/tests/test_scripts/test_ptweens.py
@@ -1,4 +1,5 @@
 import unittest
+
 from . import dummy
 
 
diff --git a/tests/test_scripts/test_pviews.py b/tests/test_scripts/test_pviews.py
index c8d29113f..b462b6f28 100644
--- a/tests/test_scripts/test_pviews.py
+++ b/tests/test_scripts/test_pviews.py
@@ -1,4 +1,5 @@
 import unittest
+
 from . import dummy
 
 
diff --git a/tests/test_session.py b/tests/test_session.py
index 582a7ed4a..8f646658e 100644
--- a/tests/test_session.py
+++ b/tests/test_session.py
@@ -2,6 +2,7 @@ import base64
 import json
 import pickle
 import unittest
+
 from pyramid import testing
 
 
diff --git a/tests/test_testing.py b/tests/test_testing.py
index be519cd15..a5746b59d 100644
--- a/tests/test_testing.py
+++ b/tests/test_testing.py
@@ -1,7 +1,7 @@
 import unittest
 from zope.component import getSiteManager
-from zope.interface import Interface
-from zope.interface import implementer
+from zope.interface import Interface, implementer
+
 from pyramid import testing
 
 
diff --git a/tests/test_threadlocal.py b/tests/test_threadlocal.py
index 487c7f4f2..609041882 100644
--- a/tests/test_threadlocal.py
+++ b/tests/test_threadlocal.py
@@ -1,6 +1,7 @@
-from pyramid import testing
 import unittest
 
+from pyramid import testing
+
 
 class TestThreadLocalManager(unittest.TestCase):
     def setUp(self):
diff --git a/tests/test_traversal.py b/tests/test_traversal.py
index fdb0bcbb7..8d679b1f7 100644
--- a/tests/test_traversal.py
+++ b/tests/test_traversal.py
@@ -3,7 +3,6 @@ import unittest
 from urllib.parse import quote
 
 from pyramid.testing import cleanUp
-
 from pyramid.util import text_
 
 
diff --git a/tests/test_tweens.py b/tests/test_tweens.py
index 054f4360d..aee1ae7cc 100644
--- a/tests/test_tweens.py
+++ b/tests/test_tweens.py
@@ -1,4 +1,5 @@
 import unittest
+
 from pyramid import testing
 
 
diff --git a/tests/test_url.py b/tests/test_url.py
index c5c0ca09f..b61b15d82 100644
--- a/tests/test_url.py
+++ b/tests/test_url.py
@@ -2,7 +2,6 @@ import os
 import unittest
 
 from pyramid import testing
-
 from pyramid.util import WIN, text_
 
 
diff --git a/tests/test_urldispatch.py b/tests/test_urldispatch.py
index 5d77042ae..5c48bea01 100644
--- a/tests/test_urldispatch.py
+++ b/tests/test_urldispatch.py
@@ -1,4 +1,5 @@
 import unittest
+
 from pyramid import testing
 from pyramid.util import text_
 
diff --git a/tests/test_util.py b/tests/test_util.py
index 84bc9379f..293036c10 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,6 +1,7 @@
 import sys
 import unittest
-from pyramid.util import text_, bytes_
+
+from pyramid.util import bytes_, text_
 
 
 class Test_InstancePropertyHelper(unittest.TestCase):
diff --git a/tests/test_view.py b/tests/test_view.py
index 5411e57c0..710fba76c 100644
--- a/tests/test_view.py
+++ b/tests/test_view.py
@@ -1,11 +1,9 @@
-import unittest
-from zope.interface import Interface
-from zope.interface import implementer
 import sys
+import unittest
+from zope.interface import Interface, implementer
 
 from pyramid import testing
-from pyramid.interfaces import IRequest
-from pyramid.interfaces import IResponse
+from pyramid.interfaces import IRequest, IResponse
 
 
 class BaseTest(object):
diff --git a/tests/test_viewderivers.py b/tests/test_viewderivers.py
index 3b5349094..0e2881683 100644
--- a/tests/test_viewderivers.py
+++ b/tests/test_viewderivers.py
@@ -3,7 +3,7 @@ from zope.interface import implementer
 
 from pyramid import testing
 from pyramid.exceptions import ConfigurationError
-from pyramid.interfaces import IResponse, IRequest
+from pyramid.interfaces import IRequest, IResponse
 
 
 class TestDeriveView(unittest.TestCase):