coverage

5 files changed, 6 insertions, 23 deletions

diff --git a/pyramid/compat.py b/pyramid/compat.py
index 552a90b4b..f464a218c 100644
--- a/pyramid/compat.py
+++ b/pyramid/compat.py
@@ -212,8 +212,7 @@ else:
 try: # pragma: no cover
     import configparser
 except ImportError: # pragma: no cover
-    import ConfigParser
-    configparser = ConfigParser
+    import ConfigParser as configparser
 
 try:
     from Cookie import SimpleCookie
@@ -225,12 +224,8 @@ if PY3: # pragma: no cover
 else:
     from cgi import escape
 
-try:
+try: # pragma: no cover
     input_ = raw_input
-except NameError:
+except NameError: # pragma: no cover
     input_ = input
 
-try: # pragma: no cover
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
diff --git a/pyramid/testing.py b/pyramid/testing.py
index b24a6cac7..148575782 100644
--- a/pyramid/testing.py
+++ b/pyramid/testing.py
@@ -807,8 +807,8 @@ def setUp(registry=None, request=None, hook_zca=True, autocommit=True,
     global have_zca
     try:
         have_zca and hook_zca and config.hook_zca()
-    except ImportError:
-        # pragma: no cover (dont choke on not being able to import z.component)
+    except ImportError: # pragma: no cover
+        # (dont choke on not being able to import z.component)
         have_zca = False
     config.begin(request=request)
     return config
diff --git a/pyramid/tests/test_paster.py b/pyramid/tests/test_paster.py
index 0182ea08b..bce5399ce 100644
--- a/pyramid/tests/test_paster.py
+++ b/pyramid/tests/test_paster.py
@@ -79,8 +79,6 @@ class Dummy:
 
 class DummyRegistry(object):
     settings = {}
-    def queryUtility(self, iface, default=None, name=''):
-        return default
 
 dummy_registry = DummyRegistry()
 
diff --git a/pyramid/tests/test_scripts.py b/pyramid/tests/test_scripts.py
index 82f4b2c52..c70b91908 100644
--- a/pyramid/tests/test_scripts.py
+++ b/pyramid/tests/test_scripts.py
@@ -923,16 +923,6 @@ class DummyIPShellFactory(object):
         self.shell = DummyIPShell()
         return self.shell
 
-class DummyLoadApp:
-    def __init__(self, app):
-        self.app = app
-
-    def __call__(self, config_name, name=None, relative_to=None):
-        self.config_name = config_name
-        self.section_name = name
-        self.relative_to = relative_to
-        return self.app
-
 class DummyApp:
     def __init__(self):
         self.registry = dummy_registry
diff --git a/pyramid/tests/test_util.py b/pyramid/tests/test_util.py
index 7c870bc45..57bcd08d7 100644
--- a/pyramid/tests/test_util.py
+++ b/pyramid/tests/test_util.py
@@ -17,7 +17,7 @@ class TestDottedNameResolver(unittest.TestCase):
 
     def test_zope_dottedname_style_resolve_builtin(self):
         typ = self._makeOne()
-        if PY3:
+        if PY3: # pragma: no cover
             result = typ._zope_dottedname_style('builtins.str')
         else:
             result = typ._zope_dottedname_style('__builtin__.str')