diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-06-07 15:03:33 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2014-06-07 15:04:06 +0200 |
| commit | d98cc41a845237edd62013e3156a0991dfb3d93e (patch) | |
| tree | 40f03e940613029ca962d44122ba4eec893be6a0 | |
| parent | 11284a63d48c84f1d60b5686d55cf8a9f8d64422 (diff) | |
Made a test compatible with Python 2 and 3.
| -rw-r--r-- | django/utils/six.py | 6 | ||||
| -rw-r--r-- | tests/backends/tests.py | 2 |
2 files changed, 7 insertions, 1 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) diff --git a/tests/backends/tests.py b/tests/backends/tests.py index 5ac0d53cb8..9d3e4a4bf1 100644 --- a/tests/backends/tests.py +++ b/tests/backends/tests.py @@ -681,7 +681,7 @@ class BackendTestCase(TestCase): self.assertIsInstance(connection.queries, list) self.assertIsInstance(connection.queries[0], dict) - self.assertItemsEqual(connection.queries[0].keys(), ['sql', 'time']) + six.assertCountEqual(self, connection.queries[0].keys(), ['sql', 'time']) reset_queries() self.assertEqual(0, len(connection.queries)) |