From d98cc41a845237edd62013e3156a0991dfb3d93e Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sat, 7 Jun 2014 15:03:33 +0200
Subject: [PATCH] Made a test compatible with Python 2 and 3.

---
 django/utils/six.py     | 6 ++++++
 tests/backends/tests.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

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))