Kaydet (Commit) fa654da6 authored tarafından Ville Skyttä's avatar Ville Skyttä Kaydeden (comit) Tim Graham

Removed usage of a few deprecated unittest assertions.

üst 7003174f
...@@ -4,6 +4,7 @@ from django.core.checks.urls import ( ...@@ -4,6 +4,7 @@ from django.core.checks.urls import (
) )
from django.test import SimpleTestCase from django.test import SimpleTestCase
from django.test.utils import override_settings from django.test.utils import override_settings
from django.utils import six
class CheckUrlsTest(SimpleTestCase): class CheckUrlsTest(SimpleTestCase):
...@@ -34,7 +35,7 @@ class CheckUrlsTest(SimpleTestCase): ...@@ -34,7 +35,7 @@ class CheckUrlsTest(SimpleTestCase):
result = check_url_config(None) result = check_url_config(None)
warning = result[0] warning = result[0]
self.assertEqual(warning.id, 'urls.E004') 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"^Your URL pattern \('\^tuple/\$', <function <lambda> at 0x(\w+)>\) is "
r"invalid. Ensure that urlpatterns is a list of url\(\) instances.$" r"invalid. Ensure that urlpatterns is a list of url\(\) instances.$"
)) ))
......
...@@ -134,14 +134,14 @@ class FunctionalTestCase(unittest.TestCase): ...@@ -134,14 +134,14 @@ class FunctionalTestCase(unittest.TestCase):
def test_lazy_repr_text(self): def test_lazy_repr_text(self):
original_object = 'Lazy translation text' original_object = 'Lazy translation text'
lazy_obj = lazy(lambda: original_object, six.text_type) 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): def test_lazy_repr_int(self):
original_object = 15 original_object = 15
lazy_obj = lazy(lambda: original_object, int) 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): def test_lazy_repr_bytes(self):
original_object = b'J\xc3\xbcst a str\xc3\xadng' original_object = b'J\xc3\xbcst a str\xc3\xadng'
lazy_obj = lazy(lambda: original_object, bytes) lazy_obj = lazy(lambda: original_object, bytes)
self.assertEquals(repr(original_object), repr(lazy_obj())) self.assertEqual(repr(original_object), repr(lazy_obj()))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment