Add a coverage environment to tox and reach 100% coverage.Python3.7support

3 files changed, 8 insertions, 15 deletions

diff --git a/src/zope/component/tests/__init__.py b/src/zope/component/tests/__init__.py
index 69e979e..bc508bb 100644
--- a/src/zope/component/tests/__init__.py
+++ b/src/zope/component/tests/__init__.py
@@ -3,7 +3,7 @@ import unittest
 def skipIfNoSecurity(testfunc):
     try:
         import zope.security
-    except ImportError:
+    except ImportError: # pragma: no cover
         return unittest.skip("zope.security not installed")(testfunc)
     return testfunc
 
diff --git a/src/zope/component/tests/test__declaration.py b/src/zope/component/tests/test__declaration.py
index 470cab0..1db841d 100644
--- a/src/zope/component/tests/test__declaration.py
+++ b/src/zope/component/tests/test__declaration.py
@@ -131,13 +131,9 @@ class Test_adapts(unittest.TestCase):
             ])
         with warnings.catch_warnings(record=True) as log:
             warnings.resetwarnings()
-            try:
+            with self.assertRaises(TypeError):
                 exec(CODE, globs, locs)
-            except TypeError:
-                if not PYTHON3:
-                    self.assertEqual(len(log), 0) # no longer warn
-            else:
-                self.fail("Didn't raise TypeError")
+            self.assertEqual(len(log), 0) # no longer warn
 
     def test_called_once_from_class(self):
         from zope.component._declaration import adapts
diff --git a/src/zope/component/tests/test_persistentregistry.py b/src/zope/component/tests/test_persistentregistry.py
index 7ae79a3..9002e30 100644
--- a/src/zope/component/tests/test_persistentregistry.py
+++ b/src/zope/component/tests/test_persistentregistry.py
@@ -19,7 +19,7 @@ import unittest
 def skipIfNoPersistent(testfunc):
     try:
         import persistent
-    except ImportError:
+    except ImportError: # pragma: no cover
         return unittest.skip("persistent not installed")(testfunc)
     return testfunc
 
@@ -40,13 +40,13 @@ class PersistentAdapterRegistryTests(unittest.TestCase):
             def __init__(self, jar):
                 self._jar = jar
                 self._mru = []
-            def mru(self, oid):
-                self._mru.append(oid)
+                # mru(oid) is only called in pure-Python runs
+                self.mru = self._mru.append
             def new_ghost(self, oid, obj):
                 obj._p_jar = self._jar
                 obj._p_oid = oid
             def update_object_size_estimation(self, oid, size):
-                return
+                "This is only called in pure-Python runs"
 
         return _Cache(jar)
 
@@ -160,7 +160,4 @@ class PersistentComponentsTests(unittest.TestCase):
                                    PersistentList))
 
 def _makeOctets(s):
-    import sys
-    if sys.version_info < (3,):
-        return bytes(s)
-    return bytes(s, 'ascii') #pragma NO COVERAGE
+    return bytes(s) if bytes is str else bytes(s, 'ascii')