Commit d98cc41a authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Made a test compatible with Python 2 and 3.

parent 11284a63

django/utils/six.py

+6 −0
Original line number Diff line number Diff line
@@ -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)

tests/backends/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -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))