fix lint on tests

11 files changed, 87 insertions, 107 deletions

diff --git a/tests/test_config/__init__.py b/tests/test_config/__init__.py
index 315e8c939..ac1f19667 100644
--- a/tests/test_config/__init__.py
+++ b/tests/test_config/__init__.py
@@ -1,5 +1,5 @@
 # package
-
+from functools import partial
 from zope.interface import implementer
 from zope.interface import Interface
 
@@ -8,11 +8,11 @@ class IFactory(Interface):
     pass
 
 
-def dummy_tween_factory(handler, registry):
+def dummy_tween_factory(handler, registry):  # pragma: no cover
     pass
 
 
-def dummy_tween_factory2(handler, registry):
+def dummy_tween_factory2(handler, registry):  # pragma: no cover
     pass
 
 
@@ -59,8 +59,6 @@ def dummy_extend2(config, discrim):
     config.action(discrim, None, config.registry)
 
 
-from functools import partial
-
 dummy_partial = partial(dummy_extend, discrim='partial')
 
 
diff --git a/tests/test_config/test_adapters.py b/tests/test_config/test_adapters.py
index 6237995d0..d871e8825 100644
--- a/tests/test_config/test_adapters.py
+++ b/tests/test_config/test_adapters.py
@@ -177,7 +177,7 @@ class AdaptersConfiguratorMixinTests(unittest.TestCase):
 
         L = []
 
-        def subscriber(event):
+        def subscriber(event):  # pragma: no cover
             L.append(event)
 
         config = self._makeOne(autocommit=True)
@@ -206,7 +206,7 @@ class AdaptersConfiguratorMixinTests(unittest.TestCase):
 
         L = []
 
-        def subscriber(event):
+        def subscriber(event):  # pragma: no cover
             L.append(event)
 
         config = self._makeOne(autocommit=True)
@@ -394,7 +394,7 @@ class Test_eventonly(unittest.TestCase):
         return eventonly(callee)
 
     def test_defaults(self):
-        def acallable(event, a=1, b=2):
+        def acallable(event, a=1, b=2):  # pragma: no cover
             pass
 
         self.assertTrue(self._callFUT(acallable))
diff --git a/tests/test_config/test_factories.py b/tests/test_config/test_factories.py
index 325ba52f3..c03d3f68b 100644
--- a/tests/test_config/test_factories.py
+++ b/tests/test_config/test_factories.py
@@ -114,7 +114,7 @@ class TestFactoriesMixin(unittest.TestCase):
 
         config = self._makeOne(autocommit=True)
 
-        def foo(self):
+        def foo(self):  # pragma: no cover
             pass
 
         config.add_request_method(foo)
@@ -126,10 +126,10 @@ class TestFactoriesMixin(unittest.TestCase):
 
         config = self._makeOne()
 
-        def foo(self):
+        def foo(self):  # pragma: no cover
             pass
 
-        def bar(self):
+        def bar(self):  # pragma: no cover
             pass
 
         config.add_request_method(foo, name='bar')
@@ -149,7 +149,7 @@ class TestFactoriesMixin(unittest.TestCase):
 
         config = self._makeOne()
 
-        def bar(self):
+        def bar(self):  # pragma: no cover
             pass
 
         config.add_request_method(name='foo')
@@ -161,13 +161,12 @@ class TestFactoriesMixin(unittest.TestCase):
         self.assertRaises(AttributeError, config.add_request_method)
 
     def test_add_request_method_with_text_type_name(self):
-        from pyramid.interfaces import IRequestExtensions
         from pyramid.compat import text_, PY2
         from pyramid.exceptions import ConfigurationError
 
         config = self._makeOne(autocommit=True)
 
-        def boomshaka(r):
+        def boomshaka(r):  # pragma: no cover
             pass
 
         def get_bad_name():
@@ -185,7 +184,7 @@ class TestFactoriesMixin(unittest.TestCase):
 
         config = self._makeOne(autocommit=True)
 
-        def dummy_policy(environ, router):
+        def dummy_policy(environ, router):  # pragma: no cover
             pass
 
         config.set_execution_policy(dummy_policy)
diff --git a/tests/test_config/test_i18n.py b/tests/test_config/test_i18n.py
index 5961e9ff2..b840c1976 100644
--- a/tests/test_config/test_i18n.py
+++ b/tests/test_config/test_i18n.py
@@ -27,7 +27,7 @@ class TestI18NConfiguratorMixin(unittest.TestCase):
 
         config = self._makeOne(autocommit=True)
 
-        def negotiator(request):
+        def negotiator(request):  # pragma: no cover
             pass
 
         config.set_locale_negotiator(negotiator)
@@ -120,8 +120,6 @@ class TestI18NConfiguratorMixin(unittest.TestCase):
         )
 
     def test_add_translation_dirs_invalid_kwargs(self):
-        from pyramid.interfaces import ITranslationDirectories
-
         config = self._makeOne(autocommit=True)
         with self.assertRaises(TypeError):
             config.add_translation_dirs('tests.pkgs.localeapp:locale', foo=1)
diff --git a/tests/test_config/test_init.py b/tests/test_config/test_init.py
index a7b19a1ac..2c92b60fb 100644
--- a/tests/test_config/test_init.py
+++ b/tests/test_config/test_init.py
@@ -1,6 +1,7 @@
-import unittest
-
 import os
+import unittest
+from zope.interface import Interface
+from zope.interface import implementer
 
 from pyramid.compat import im_func
 from pyramid.testing import skip_on
@@ -320,7 +321,7 @@ class ConfiguratorTests(unittest.TestCase):
         from pyramid.interfaces import IExceptionResponse
         from pyramid.interfaces import IRequest
 
-        def exceptionresponse_view(context, request):
+        def exceptionresponse_view(context, request):  # pragma: no cover
             pass
 
         config = self._makeOne(exceptionresponse_view=exceptionresponse_view)
@@ -793,7 +794,8 @@ tests.test_config.dummy_include2"""
         reg = Registry()
         config = self._makeOne(reg)
         settings = {
-            'pyramid.includes': """tests.test_config.dummy_include tests.test_config.dummy_include2"""
+            'pyramid.includes': """tests.test_config.dummy_include tests.\
+test_config.dummy_include2"""
         }
         config.setup_registry(settings=settings)
         self.assertTrue(reg.included)
@@ -963,7 +965,6 @@ tests.test_config.dummy_include2"""
 
     def test_include_threadlocals_active(self):
         from pyramid.threadlocal import get_current_registry
-        from tests import test_config
 
         stack = []
 
@@ -1308,10 +1309,10 @@ tests.test_config.dummy_include2"""
     def test_commit_conflict_simple(self):
         config = self._makeOne()
 
-        def view1(request):
+        def view1(request):  # pragma: no cover
             pass
 
-        def view2(request):
+        def view2(request):  # pragma: no cover
             pass
 
         config.add_view(view1)
@@ -1321,10 +1322,10 @@ tests.test_config.dummy_include2"""
     def test_commit_conflict_resolved_with_include(self):
         config = self._makeOne()
 
-        def view1(request):
+        def view1(request):  # pragma: no cover
             pass
 
-        def view2(request):
+        def view2(request):  # pragma: no cover
             pass
 
         def includeme(config):
@@ -1339,10 +1340,10 @@ tests.test_config.dummy_include2"""
     def test_commit_conflict_with_two_includes(self):
         config = self._makeOne()
 
-        def view1(request):
+        def view1(request):  # pragma: no cover
             pass
 
-        def view2(request):
+        def view2(request):  # pragma: no cover
             pass
 
         def includeme1(config):
@@ -1365,13 +1366,13 @@ tests.test_config.dummy_include2"""
     def test_commit_conflict_resolved_with_two_includes_and_local(self):
         config = self._makeOne()
 
-        def view1(request):
+        def view1(request):  # pragma: no cover
             pass
 
-        def view2(request):
+        def view2(request):  # pragma: no cover
             pass
 
-        def view3(request):
+        def view3(request):  # pragma: no cover
             pass
 
         def includeme1(config):
@@ -1392,13 +1393,13 @@ tests.test_config.dummy_include2"""
 
         config = self._makeOne(autocommit=True)
 
-        def view1(request):
+        def view1(request):  # pragma: no cover
             pass
 
-        def view2(request):
+        def view2(request):  # pragma: no cover
             pass
 
-        def view3(request):
+        def view3(request):  # pragma: no cover
             pass
 
         config.add_view(view1, renderer=null_renderer)
@@ -1411,10 +1412,10 @@ tests.test_config.dummy_include2"""
     def test_conflict_set_notfound_view(self):
         config = self._makeOne()
 
-        def view1(request):
+        def view1(request):  # pragma: no cover
             pass
 
-        def view2(request):
+        def view2(request):  # pragma: no cover
             pass
 
         config.set_notfound_view(view1)
@@ -1431,10 +1432,10 @@ tests.test_config.dummy_include2"""
     def test_conflict_set_forbidden_view(self):
         config = self._makeOne()
 
-        def view1(request):
+        def view1(request):  # pragma: no cover
             pass
 
-        def view2(request):
+        def view2(request):  # pragma: no cover
             pass
 
         config.set_forbidden_view(view1)
@@ -1461,7 +1462,7 @@ tests.test_config.dummy_include2"""
     def test___getattr__matches(self):
         config = self._makeOne()
 
-        def foo(config):
+        def foo(config):  # pragma: no cover
             pass
 
         directives = {'foo': (foo, True)}
@@ -1472,7 +1473,7 @@ tests.test_config.dummy_include2"""
     def test___getattr__matches_no_action_wrap(self):
         config = self._makeOne()
 
-        def foo(config):
+        def foo(config):  # pragma: no cover
             pass
 
         directives = {'foo': (foo, False)}
@@ -1977,7 +1978,7 @@ class TestActionState(unittest.TestCase):
         def f(*a, **k):
             c.actions.append((3, g, (8,), {}, (), None, -1))
 
-        def g(*a, **k):
+        def g(*a, **k):  # pragma: no cover
             pass
 
         c.actions = [(1, f, (1,))]
@@ -2004,7 +2005,7 @@ class TestActionState(unittest.TestCase):
         def f(*a, **k):
             pass
 
-        def g(*a, **k):
+        def g(*a, **k):  # pragma: no cover
             pass
 
         c.actions = [(1, f, (1,), {}, (), None, -1), (1, g, (2,))]
@@ -2018,7 +2019,7 @@ class TestActionState(unittest.TestCase):
         def f(*a, **k):
             c.actions.append((1, g, (8,)))
 
-        def g(*a, **k):
+        def g(*a, **k):  # pragma: no cover
             pass
 
         c.actions = [(1, f, (1,), {}, (), None, -1)]
@@ -2043,7 +2044,7 @@ class Test_reentrant_action_functional(unittest.TestCase):
         config = self._makeConfigurator()
         config.add_directive('add_auto_route', add_auto_route)
 
-        def my_view(request):
+        def my_view(request):  # pragma: no cover
             return request.response
 
         config.add_auto_route('foo', my_view)
@@ -2429,9 +2430,6 @@ class DummyThreadLocalManager(object):
         self.popped = True
 
 
-from zope.interface import implementer
-
-
 @implementer(IDummy)
 class DummyEvent:
     pass
@@ -2461,9 +2459,6 @@ class DummyRegistry(object):
         return self.util
 
 
-from zope.interface import Interface
-
-
 class IOther(Interface):
     pass
 
diff --git a/tests/test_config/test_routes.py b/tests/test_config/test_routes.py
index 0999f8072..d6f45608d 100644
--- a/tests/test_config/test_routes.py
+++ b/tests/test_config/test_routes.py
@@ -164,10 +164,10 @@ class RoutesConfiguratorMixinTests(unittest.TestCase):
 
         config = self._makeOne(autocommit=True)
 
-        def pred1(context, request):
+        def pred1(context, request):  # pragma: no cover
             pass
 
-        def pred2(context, request):
+        def pred2(context, request):  # pragma: no cover
             pass
 
         with warnings.catch_warnings(record=True) as w:
diff --git a/tests/test_config/test_security.py b/tests/test_config/test_security.py
index 77f7f0440..5ebd78f8d 100644
--- a/tests/test_config/test_security.py
+++ b/tests/test_config/test_security.py
@@ -133,7 +133,7 @@ class ConfiguratorSecurityMethodsTests(unittest.TestCase):
 
         config = self._makeOne(autocommit=True)
 
-        def callback(request):
+        def callback(request):  # pragma: no cover
             return True
 
         config.set_default_csrf_options(
diff --git a/tests/test_config/test_testing.py b/tests/test_config/test_testing.py
index c0a98f9ad..ce6659667 100644
--- a/tests/test_config/test_testing.py
+++ b/tests/test_config/test_testing.py
@@ -1,4 +1,5 @@
 import unittest
+from zope.interface import implementer
 
 from pyramid.compat import text_
 from pyramid.security import AuthenticationAPIMixin, AuthorizationAPIMixin
@@ -222,9 +223,6 @@ class TestingConfiguratorMixinTests(unittest.TestCase):
         renderer.assert_(request=request)
 
 
-from zope.interface import implementer
-
-
 @implementer(IDummy)
 class DummyEvent:
     pass
diff --git a/tests/test_config/test_tweens.py b/tests/test_config/test_tweens.py
index ed41c9a43..805310c9a 100644
--- a/tests/test_config/test_tweens.py
+++ b/tests/test_config/test_tweens.py
@@ -17,10 +17,10 @@ class TestTweensConfiguratorMixin(unittest.TestCase):
         from pyramid.interfaces import ITweens
         from pyramid.tweens import excview_tween_factory
 
-        def factory1(handler, registry):
+        def factory1(handler, registry):  # pragma: no cover
             return handler
 
-        def factory2(handler, registry):
+        def factory2(handler, registry):  # pragma: no cover
             return handler
 
         config = self._makeOne()
diff --git a/tests/test_config/test_util.py b/tests/test_config/test_util.py
index a56c00082..50d143b2d 100644
--- a/tests/test_config/test_util.py
+++ b/tests/test_config/test_util.py
@@ -426,7 +426,7 @@ class TestDeprecatedPredicates(unittest.TestCase):
 
         with warnings.catch_warnings(record=True) as w:
             warnings.filterwarnings('always')
-            from pyramid.config.predicates import XHRPredicate
+            from pyramid.config.predicates import XHRPredicate  # noqa: F401
 
             self.assertEqual(len(w), 1)
 
@@ -493,7 +493,7 @@ class DummyCustomPredicate(object):
     def __init__(self):
         self.__text__ = 'custom predicate'
 
-    def classmethod_predicate(*args):
+    def classmethod_predicate(*args):  # pragma: no cover
         pass
 
     classmethod_predicate.__text__ = 'classmethod predicate'
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index 9b2a306f6..977944fdd 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -1,15 +1,16 @@
 import os
 import unittest
-from pyramid import testing
-
-from . import IDummy
-
-from . import dummy_view
+from zope.interface import implementer
 
+from pyramid import testing
 from pyramid.compat import im_func, text_
 from pyramid.exceptions import ConfigurationError
 from pyramid.exceptions import ConfigurationExecutionError
 from pyramid.exceptions import ConfigurationConflictError
+from pyramid.interfaces import IResponse, IRequest, IMultiView
+
+from . import IDummy
+from . import dummy_view
 
 
 class TestViewsConfigurationMixin(unittest.TestCase):
@@ -859,7 +860,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         def view(context, request):
             return 'OK'
 
-        def view2(context, request):
+        def view2(context, request):  # pragma: no cover
             return 'OK2'
 
         def view3(context, request):
@@ -884,7 +885,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         def view(context, request):
             return 'OK'
 
-        def view2(context, request):
+        def view2(context, request):  # pragma: no cover
             return 'OK2'
 
         def view3(context, request):
@@ -1332,7 +1333,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             def __init__(self, request):
                 pass
 
-        def unknown(context, request):
+        def unknown(context, request):  # pragma: no cover
             return 'unknown'
 
         def view(context, request):
@@ -1379,7 +1380,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
             def __init__(self, request):
                 pass
 
-        def unknown(context, request):
+        def unknown(context, request):  # pragma: no cover
             return 'unknown'
 
         def view(context, request):
@@ -2048,7 +2049,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         from pyramid.exceptions import BadCSRFToken
         from pyramid.renderers import null_renderer
 
-        def view(request):
+        def view(request):  # pragma: no cover
             return 'OK'
 
         config = self._makeOne(autocommit=True)
@@ -2251,13 +2252,12 @@ class TestViewsConfigurationMixin(unittest.TestCase):
 
     def test_add_view_class_method_no_attr(self):
         from pyramid.renderers import null_renderer
-        from zope.interface import directlyProvides
         from pyramid.exceptions import ConfigurationError
 
         config = self._makeOne(autocommit=True)
 
         class DummyViewClass(object):
-            def run(self):
+            def run(self):  # pragma: no cover
                 pass
 
         def configure_view():
@@ -2728,7 +2728,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         config = self._makeOne(autocommit=True)
         config.add_route('foo', '/foo/')
 
-        def view(request):
+        def view(request):  # pragma: no cover
             return Response('OK')
 
         config.add_notfound_view(
@@ -2757,7 +2757,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         config = self._makeOne(autocommit=True)
         config.add_route('foo', '/foo/')
 
-        def view(request):
+        def view(request):  # pragma: no cover
             return Response('OK')
 
         config.add_notfound_view(
@@ -2989,7 +2989,7 @@ class Test_runtime_exc_view(unittest.TestCase):
         def view1(context, request):
             return 'OK'
 
-        def view2(context, request):
+        def view2(context, request):  # pragma: no cover
             raise AssertionError
 
         result_view = self._makeOne(view1, view2)
@@ -2998,7 +2998,7 @@ class Test_runtime_exc_view(unittest.TestCase):
         self.assertEqual(result, 'OK')
 
     def test_call_dispatches_on_exception(self):
-        def view1(context, request):
+        def view1(context, request):  # pragma: no cover
             raise AssertionError
 
         def view2(context, request):
@@ -3011,15 +3011,15 @@ class Test_runtime_exc_view(unittest.TestCase):
         self.assertEqual(result, 'OK')
 
     def test_permitted(self):
-        def errfn(context, request):
+        def errfn(context, request):  # pragma: no cover
             raise AssertionError
 
-        def view1(context, request):
+        def view1(context, request):  # pragma: no cover
             raise AssertionError
 
         view1.__permitted__ = lambda c, r: 'OK'
 
-        def view2(context, request):
+        def view2(context, request):  # pragma: no cover
             raise AssertionError
 
         view2.__permitted__ = errfn
@@ -3029,15 +3029,15 @@ class Test_runtime_exc_view(unittest.TestCase):
         self.assertEqual(result, 'OK')
 
     def test_permitted_dispatches_on_exception(self):
-        def errfn(context, request):
+        def errfn(context, request):  # pragma: no cover
             raise AssertionError
 
-        def view1(context, request):
+        def view1(context, request):  # pragma: no cover
             raise AssertionError
 
         view1.__permitted__ = errfn
 
-        def view2(context, request):
+        def view2(context, request):  # pragma: no cover
             raise AssertionError
 
         view2.__permitted__ = lambda c, r: 'OK'
@@ -3055,17 +3055,17 @@ class Test_requestonly(unittest.TestCase):
         return requestonly(view, attr=attr)
 
     def test_defaults(self):
-        def aview(request, a=1, b=2):
+        def aview(request, a=1, b=2):  # pragma: no cover
             pass
 
         self.assertTrue(self._callFUT(aview))
 
     def test_otherattr(self):
         class AView(object):
-            def __init__(self, request, a=1, b=2):
+            def __init__(self, request, a=1, b=2):  # pragma: no cover
                 pass
 
-            def bleh(self):
+            def bleh(self):  # pragma: no cover
                 pass
 
         self.assertTrue(self._callFUT(AView, 'bleh'))
@@ -3166,13 +3166,13 @@ class TestMultiView(unittest.TestCase):
     def test_add_with_phash_override_accept(self):
         mv = self._makeOne()
 
-        def view1():
+        def view1():  # pragma: no cover
             pass
 
-        def view2():
+        def view2():  # pragma: no cover
             pass
 
-        def view3():
+        def view3():  # pragma: no cover
             pass
 
         mv.add(view1, 100, accept='text/html', phash='abc')
@@ -3186,13 +3186,13 @@ class TestMultiView(unittest.TestCase):
     def test_add_with_phash_override_accept2(self):
         mv = self._makeOne()
 
-        def view1():
+        def view1():  # pragma: no cover
             pass
 
-        def view2():
+        def view2():  # pragma: no cover
             pass
 
-        def view3():
+        def view3():  # pragma: no cover
             pass
 
         mv.add(view1, 100, accept='text/html', phash='abc')
@@ -3207,10 +3207,10 @@ class TestMultiView(unittest.TestCase):
         # this failed on py3 at one point, because functions aren't orderable
         # and we were sorting the views via a plain sort() rather than
         # sort(key=itemgetter(0)).
-        def view1(request):
+        def view1(request):  # pragma: no cover
             pass
 
-        def view2(request):
+        def view2(request):  # pragma: no cover
             pass
 
         mv = self._makeOne()
@@ -3692,12 +3692,12 @@ class Test_preserve_view_attrs(unittest.TestCase):
         self.assertTrue(result is view)
 
     def test_it_different_with_existing_original_view(self):
-        def view1(context, request):
+        def view1(context, request):  # pragma: no cover
             pass
 
         view1.__original_view__ = 'abc'
 
-        def view2(context, request):
+        def view2(context, request):  # pragma: no cover
             pass
 
         result = self._callFUT(view1, view2)
@@ -3950,7 +3950,7 @@ class TestStaticURLInfo(unittest.TestCase):
         self.assertTrue(called[0])
 
     def test_generate_url_cachebust_nomatch(self):
-        def fake_cb(*a, **kw):
+        def fake_cb(*a, **kw):  # pragma: no cover
             raise AssertionError
 
         inst = self._makeOne()
@@ -4188,7 +4188,7 @@ class Test_view_description(unittest.TestCase):
         return view_description(view)
 
     def test_with_text(self):
-        def view():
+        def view():  # pragma: no cover
             pass
 
         view.__text__ = 'some text'
@@ -4196,7 +4196,7 @@ class Test_view_description(unittest.TestCase):
         self.assertEqual(result, 'some text')
 
     def test_without_text(self):
-        def view():
+        def view():  # pragma: no cover
             pass
 
         result = self._callFUT(view)
@@ -4228,10 +4228,6 @@ class DummyRegistry:
         return self.utility or default
 
 
-from zope.interface import implementer
-from pyramid.interfaces import IResponse, IRequest
-
-
 @implementer(IResponse)
 class DummyResponse(object):
     content_type = None
@@ -4295,10 +4291,6 @@ class DummyConfig:
         return {}
 
 
-from zope.interface import implementer
-from pyramid.interfaces import IMultiView
-
-
 @implementer(IMultiView)
 class DummyMultiView:
     def __init__(self):