diff options
Diffstat (limited to 'tests/test_scripts')
| -rw-r--r-- | tests/test_scripts/test_proutes.py | 41 | ||||
| -rw-r--r-- | tests/test_scripts/test_pviews.py | 59 |
2 files changed, 47 insertions, 53 deletions
diff --git a/tests/test_scripts/test_proutes.py b/tests/test_scripts/test_proutes.py index a585a02aa..8ac5d0fd1 100644 --- a/tests/test_scripts/test_proutes.py +++ b/tests/test_scripts/test_proutes.py @@ -118,6 +118,7 @@ class TestPRoutesCommand(unittest.TestCase): def test_single_route_no_views_registered(self): from zope.interface import Interface + from pyramid.interfaces import IRouteRequest registry = self._makeRegistry() @@ -143,9 +144,8 @@ class TestPRoutesCommand(unittest.TestCase): def test_single_route_one_view_registered(self): from zope.interface import Interface - from pyramid.interfaces import IRouteRequest - from pyramid.interfaces import IViewClassifier - from pyramid.interfaces import IView + + from pyramid.interfaces import IRouteRequest, IView, IViewClassifier registry = self._makeRegistry() @@ -176,9 +176,8 @@ class TestPRoutesCommand(unittest.TestCase): def test_one_route_with_long_name_one_view_registered(self): from zope.interface import Interface - from pyramid.interfaces import IRouteRequest - from pyramid.interfaces import IViewClassifier - from pyramid.interfaces import IView + + from pyramid.interfaces import IRouteRequest, IView, IViewClassifier registry = self._makeRegistry() @@ -249,9 +248,8 @@ class TestPRoutesCommand(unittest.TestCase): def test_single_route_one_view_registered_with_factory(self): from zope.interface import Interface - from pyramid.interfaces import IRouteRequest - from pyramid.interfaces import IViewClassifier - from pyramid.interfaces import IView + + from pyramid.interfaces import IRouteRequest, IView, IViewClassifier registry = self._makeRegistry() @@ -286,9 +284,12 @@ class TestPRoutesCommand(unittest.TestCase): def test_single_route_multiview_registered(self): from zope.interface import Interface - from pyramid.interfaces import IRouteRequest - from pyramid.interfaces import IViewClassifier - from pyramid.interfaces import IMultiView + + from pyramid.interfaces import ( + IMultiView, + IRouteRequest, + IViewClassifier, + ) registry = self._makeRegistry() @@ -526,8 +527,8 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(compare_to, expected) def test_route_is_get_view_request_method_not_post(self): - from pyramid.renderers import null_renderer as nr from pyramid.config import not_ + from pyramid.renderers import null_renderer as nr def view1(context, request): # pragma: no cover return 'view1' @@ -558,8 +559,8 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(compare_to, expected) def test_view_request_method_not_post(self): - from pyramid.renderers import null_renderer as nr from pyramid.config import not_ + from pyramid.renderers import null_renderer as nr def view1(context, request): # pragma: no cover return 'view1' @@ -590,8 +591,8 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(compare_to, expected) def test_view_glob(self): - from pyramid.renderers import null_renderer as nr from pyramid.config import not_ + from pyramid.renderers import null_renderer as nr def view1(context, request): # pragma: no cover return 'view1' @@ -635,8 +636,8 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(compare_to, expected) def test_good_format(self): - from pyramid.renderers import null_renderer as nr from pyramid.config import not_ + from pyramid.renderers import null_renderer as nr def view1(context, request): # pragma: no cover return 'view1' @@ -666,8 +667,8 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(L[0].split(), ['Method', 'Name']) def test_bad_format(self): - from pyramid.renderers import null_renderer as nr from pyramid.config import not_ + from pyramid.renderers import null_renderer as nr def view1(context, request): # pragma: no cover return 'view1' @@ -696,8 +697,8 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(L[0], expected) def test_config_format_ini_newlines(self): - from pyramid.renderers import null_renderer as nr from pyramid.config import not_ + from pyramid.renderers import null_renderer as nr def view1(context, request): # pragma: no cover return 'view1' @@ -730,8 +731,8 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(L[0].split(), ['Method', 'Name']) def test_config_format_ini_spaces(self): - from pyramid.renderers import null_renderer as nr from pyramid.config import not_ + from pyramid.renderers import null_renderer as nr def view1(context, request): # pragma: no cover return 'view1' @@ -764,8 +765,8 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(L[0].split(), ['Method', 'Name']) def test_config_format_ini_commas(self): - from pyramid.renderers import null_renderer as nr from pyramid.config import not_ + from pyramid.renderers import null_renderer as nr def view1(context, request): # pragma: no cover return 'view1' diff --git a/tests/test_scripts/test_pviews.py b/tests/test_scripts/test_pviews.py index fb809fdcd..36b63ef99 100644 --- a/tests/test_scripts/test_pviews.py +++ b/tests/test_scripts/test_pviews.py @@ -40,13 +40,11 @@ class TestPViewsCommand(unittest.TestCase): self.assertEqual(result, None) def test__find_view_no_match_multiview_registered(self): - from zope.interface import implementer - from zope.interface import providedBy - from pyramid.interfaces import IRequest - from pyramid.interfaces import IViewClassifier - from pyramid.interfaces import IMultiView - from pyramid.traversal import DefaultRootFactory + from zope.interface import implementer, providedBy + + from pyramid.interfaces import IMultiView, IRequest, IViewClassifier from pyramid.registry import Registry + from pyramid.traversal import DefaultRootFactory registry = Registry() @@ -69,11 +67,10 @@ class TestPViewsCommand(unittest.TestCase): def test__find_view_traversal(self): from zope.interface import providedBy - from pyramid.interfaces import IRequest - from pyramid.interfaces import IViewClassifier - from pyramid.interfaces import IView - from pyramid.traversal import DefaultRootFactory + + from pyramid.interfaces import IRequest, IView, IViewClassifier from pyramid.registry import Registry + from pyramid.traversal import DefaultRootFactory registry = Registry() @@ -94,13 +91,11 @@ class TestPViewsCommand(unittest.TestCase): self.assertEqual(result, view1) def test__find_view_traversal_multiview(self): - from zope.interface import implementer - from zope.interface import providedBy - from pyramid.interfaces import IRequest - from pyramid.interfaces import IViewClassifier - from pyramid.interfaces import IMultiView - from pyramid.traversal import DefaultRootFactory + from zope.interface import implementer, providedBy + + from pyramid.interfaces import IMultiView, IRequest, IViewClassifier from pyramid.registry import Registry + from pyramid.traversal import DefaultRootFactory registry = Registry() @@ -123,11 +118,9 @@ class TestPViewsCommand(unittest.TestCase): self.assertEqual(result, view) def test__find_view_route_no_multiview(self): - from zope.interface import Interface - from zope.interface import implementer - from pyramid.interfaces import IRouteRequest - from pyramid.interfaces import IViewClassifier - from pyramid.interfaces import IView + from zope.interface import Interface, implementer + + from pyramid.interfaces import IRouteRequest, IView, IViewClassifier from pyramid.registry import Registry registry = Registry() @@ -162,11 +155,9 @@ class TestPViewsCommand(unittest.TestCase): self.assertEqual(result, view) def test__find_view_route_multiview_no_view_registered(self): - from zope.interface import Interface - from zope.interface import implementer - from pyramid.interfaces import IRouteRequest - from pyramid.interfaces import IMultiView - from pyramid.interfaces import IRootFactory + from zope.interface import Interface, implementer + + from pyramid.interfaces import IMultiView, IRootFactory, IRouteRequest from pyramid.registry import Registry registry = Registry() @@ -206,13 +197,15 @@ class TestPViewsCommand(unittest.TestCase): self.assertTrue(IMultiView.providedBy(result)) def test__find_view_route_multiview(self): - from zope.interface import Interface - from zope.interface import implementer - from pyramid.interfaces import IRouteRequest - from pyramid.interfaces import IViewClassifier - from pyramid.interfaces import IView - from pyramid.interfaces import IMultiView - from pyramid.interfaces import IRootFactory + from zope.interface import Interface, implementer + + from pyramid.interfaces import ( + IMultiView, + IRootFactory, + IRouteRequest, + IView, + IViewClassifier, + ) from pyramid.registry import Registry registry = Registry() |