From 8854637933df9e7df8940c2f62122c5e61d58219 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 26 Dec 2019 13:27:39 -0600 Subject: isort --- tests/test_config/__init__.py | 3 +-- tests/test_config/pkgs/scannable/__init__.py | 2 +- tests/test_config/pkgs/scannable/another.py | 2 +- tests/test_config/pkgs/scannable/pod/notinit.py | 2 +- .../pkgs/scannable/subpackage/__init__.py | 2 +- .../pkgs/scannable/subpackage/notinit.py | 2 +- .../scannable/subpackage/subsubpackage/__init__.py | 2 +- tests/test_config/test_actions.py | 7 ++++--- tests/test_config/test_assets.py | 1 + tests/test_config/test_init.py | 21 ++++++++++++--------- tests/test_config/test_routes.py | 4 ++-- tests/test_config/test_security.py | 3 +-- tests/test_config/test_testing.py | 3 ++- tests/test_config/test_tweens.py | 5 ++--- tests/test_config/test_views.py | 13 +++++++------ 15 files changed, 38 insertions(+), 34 deletions(-) (limited to 'tests/test_config') 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): -- cgit v1.2.3