p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed usage of a few deprecated unittest assertions.

This commit is contained in:
Ville Skyttä 2016-06-14 16:03:12 +03:00 committed by Tim Graham
parent 7003174fec
commit fa654da613
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/check_framework/test_urls.py
View File

@ -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.$"
))

6
tests/utils_tests/test_functional.py
View File

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