eric6/DebugClients/Python/coverage/backunittest.py

changeset 7427
362cd1b6f81a
parent 6942
2602857055c5
child 7702
f8b97639deb5
--- a/eric6/DebugClients/Python/coverage/backunittest.py	Wed Feb 19 19:38:36 2020 +0100
+++ b/eric6/DebugClients/Python/coverage/backunittest.py	Sat Feb 22 14:27:42 2020 +0100
@@ -1,14 +1,9 @@
 # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
-# For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt
+# For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
 
 """Implementations of unittest features from the future."""
 
-# Use unittest2 if it's available, otherwise unittest.  This gives us
-# back-ported features for 2.6.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 def unittest_has(method):
@@ -23,15 +18,11 @@
     `unittest` doesn't have them.
 
     """
-    # pylint: disable=missing-docstring
+    # pylint: disable=arguments-differ, deprecated-method
 
-    # Many Pythons have this method defined.  But PyPy3 has a bug with it
-    # somehow (https://bitbucket.org/pypy/pypy/issues/2092), so always use our
-    # own implementation that works everywhere, at least for the ways we're
-    # calling it.
-    def assertCountEqual(self, s1, s2):
-        """Assert these have the same elements, regardless of order."""
-        self.assertEqual(sorted(s1), sorted(s2))
+    if not unittest_has('assertCountEqual'):
+        def assertCountEqual(self, *args, **kwargs):
+            return self.assertItemsEqual(*args, **kwargs)
 
     if not unittest_has('assertRaisesRegex'):
         def assertRaisesRegex(self, *args, **kwargs):

eric ide

mercurial