Commit fa654da6 authored by Ville Skyttä's avatar Ville Skyttä Committed by Tim Graham
Browse files

Removed usage of a few deprecated unittest assertions.

parent 7003174f

tests/check_framework/test_urls.py

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ from django.core.checks.urls import ( 
)

from django.test import SimpleTestCase

from django.test.utils import override_settings

from django.utils import six





class CheckUrlsTest(SimpleTestCase):
@@ -34,7 +35,7 @@ class CheckUrlsTest(SimpleTestCase): 
        result = check_url_config(None)

        warning = result[0]

        self.assertEqual(warning.id, 'urls.E004')

        self.assertRegexpMatches(warning.msg, (

        six.assertRegex(self, warning.msg, (

            r"^Your URL pattern \('\^tuple/\$', <function <lambda> at 0x(\w+)>\) is "

            r"invalid. Ensure that urlpatterns is a list of url\(\) instances.$"

        ))

tests/utils_tests/test_functional.py

+3 −3
Original line number Diff line number Diff line
@@ -134,14 +134,14 @@ class FunctionalTestCase(unittest.TestCase): 
    def test_lazy_repr_text(self):

        original_object = 'Lazy translation text'

        lazy_obj = lazy(lambda: original_object, six.text_type)

        self.assertEquals(repr(original_object), repr(lazy_obj()))

        self.assertEqual(repr(original_object), repr(lazy_obj()))



    def test_lazy_repr_int(self):

        original_object = 15

        lazy_obj = lazy(lambda: original_object, int)

        self.assertEquals(repr(original_object), repr(lazy_obj()))

        self.assertEqual(repr(original_object), repr(lazy_obj()))



    def test_lazy_repr_bytes(self):

        original_object = b'J\xc3\xbcst a str\xc3\xadng'

        lazy_obj = lazy(lambda: original_object, bytes)

        self.assertEquals(repr(original_object), repr(lazy_obj()))
 
        self.assertEqual(repr(original_object), repr(lazy_obj()))