diff options
| -rw-r--r-- | coverage/backunittest.py | 11 | ||||
| -rw-r--r-- | coverage/backward.py | 8 | ||||
| -rw-r--r-- | coverage/misc.py | 4 |
3 files changed, 5 insertions, 18 deletions
diff --git a/coverage/backunittest.py b/coverage/backunittest.py index 6498397f..b2b7ca2f 100644 --- a/coverage/backunittest.py +++ b/coverage/backunittest.py @@ -23,14 +23,9 @@ class TestCase(unittest.TestCase): # pylint: disable=missing-docstring if not unittest_has('assertCountEqual'): - if unittest_has('assertSameElements'): - def assertCountEqual(self, *args, **kwargs): - # pylint: disable=no-member - return self.assertSameElements(*args, **kwargs) - else: - def assertCountEqual(self, s1, s2): - """Assert these have the same elements, regardless of order.""" - self.assertEqual(set(s1), set(s2)) + def assertCountEqual(self, s1, s2): + """Assert these have the same elements, regardless of order.""" + self.assertEqual(set(s1), set(s2)) if not unittest_has('assertRaisesRegex'): def assertRaisesRegex(self, *args, **kwargs): diff --git a/coverage/backward.py b/coverage/backward.py index a7888a24..11f8e00b 100644 --- a/coverage/backward.py +++ b/coverage/backward.py @@ -118,14 +118,6 @@ else: for byte in bytes_value: yield ord(byte) -# Md5 is available in different places. -try: - import hashlib - md5 = hashlib.md5 -except ImportError: - import md5 - md5 = md5.new - try: # In Py 2.x, the builtins were in __builtin__ diff --git a/coverage/misc.py b/coverage/misc.py index 4b1dccb2..48727478 100644 --- a/coverage/misc.py +++ b/coverage/misc.py @@ -1,10 +1,10 @@ """Miscellaneous stuff for Coverage.""" import errno +import hashlib import inspect import os -from coverage.backward import md5 from coverage.backward import string_class, to_bytes @@ -106,7 +106,7 @@ def file_be_gone(path): class Hasher(object): """Hashes Python data into md5.""" def __init__(self): - self.md5 = md5() + self.md5 = hashlib.md5() def update(self, v): """Add `v` to the hash, recursively if needed.""" |