Made a test compatible with Python 2 and 3.

1 files changed, 6 insertions, 0 deletions

diff --git a/django/utils/six.py b/django/utils/six.py
index bf94a83000..eb32ab8834 100644
--- a/django/utils/six.py
+++ b/django/utils/six.py
@@ -663,10 +663,12 @@ def add_metaclass(metaclass):
 ### Additional customizations for Django ###
 
 if PY3:
+    _assertCountEqual = "assertCountEqual"
     _assertRaisesRegex = "assertRaisesRegex"
     _assertRegex = "assertRegex"
     memoryview = memoryview
 else:
+    _assertCountEqual = "assertItemsEqual"
     _assertRaisesRegex = "assertRaisesRegexp"
     _assertRegex = "assertRegexpMatches"
     # memoryview and buffer are not strictly equivalent, but should be fine for
@@ -678,6 +680,10 @@ else:
         memoryview = buffer
 
 
+def assertCountEqual(self, *args, **kwargs):
+    return getattr(self, _assertCountEqual)(*args, **kwargs)
+
+
 def assertRaisesRegex(self, *args, **kwargs):
     return getattr(self, _assertRaisesRegex)(*args, **kwargs)