diff options
author | Claude Paroz <claude@2xlibre.net> | 2016-12-01 11:38:01 +0100 |
---|---|---|
committer | Claude Paroz <claude@2xlibre.net> | 2017-01-18 16:21:28 +0100 |
commit | c716fe87821df00f9f03ecc761c914d1682591a2 (patch) | |
tree | 0436706cdb190acbc76fb5fcf6d66f16e09fafa3 /tests/urlpatterns_reverse | |
parent | e63d98b7beb16d1410168a2315cbe04c43c9c80d (diff) | |
download | django-c716fe87821df00f9f03ecc761c914d1682591a2.tar.gz |
Refs #23919 -- Removed six.PY2/PY3 usage
Thanks Tim Graham for the review.
Diffstat (limited to 'tests/urlpatterns_reverse')
-rw-r--r-- | tests/urlpatterns_reverse/tests.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py index a84e5bfb24..157479a579 100644 --- a/tests/urlpatterns_reverse/tests.py +++ b/tests/urlpatterns_reverse/tests.py @@ -3,7 +3,6 @@ Unit tests for reverse URL lookups. """ import sys import threading -import unittest from admin_scripts.tests import AdminScriptTestCase @@ -430,7 +429,7 @@ class ResolverTests(SimpleTestCase): [{'type': RegexURLResolver}, {'type': RegexURLPattern, 'name': None}], [{'type': RegexURLResolver}, {'type': RegexURLResolver}], ] - with self.assertRaisesMessage(Resolver404, b'tried' if six.PY2 else 'tried') as cm: + with self.assertRaisesMessage(Resolver404, 'tried') as cm: resolve('/included/non-existent-url', urlconf=urls) e = cm.exception # make sure we at least matched the root ('/') url resolver: @@ -463,7 +462,6 @@ class ResolverTests(SimpleTestCase): self.assertTrue(resolver._is_callback('urlpatterns_reverse.nested_urls.View3')) self.assertFalse(resolver._is_callback('urlpatterns_reverse.nested_urls.blub')) - @unittest.skipIf(six.PY2, "Python 2 doesn't support __qualname__.") def test_view_detail_as_method(self): # Views which have a class name as part of their path. resolver = get_resolver('urlpatterns_reverse.method_view_urls') @@ -503,11 +501,6 @@ class ReverseLazyTest(TestCase): 'Some URL: %s' % reverse_lazy('some-login-page'), 'Some URL: /login/' ) - if six.PY2: - self.assertEqual( - b'Some URL: %s' % reverse_lazy('some-login-page'), - 'Some URL: /login/' - ) class ReverseLazySettingsTest(AdminScriptTestCase): |