From b5f0b3478dfcf0335f8ac2038d59f54b4a05f2a0 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 7 Dec 2016 17:42:31 -0500 Subject: Fixed #27579 -- Added aliases for Python 3's assertion names in SimpleTestCase. --- tests/utils_tests/test_module_loading.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/utils_tests/test_module_loading.py') diff --git a/tests/utils_tests/test_module_loading.py b/tests/utils_tests/test_module_loading.py index 738d3c7d04..2a524a2cf2 100644 --- a/tests/utils_tests/test_module_loading.py +++ b/tests/utils_tests/test_module_loading.py @@ -7,7 +7,6 @@ from zipimport import zipimporter from django.test import SimpleTestCase, TestCase, modify_settings from django.test.utils import extend_sys_path -from django.utils import six from django.utils._os import upath from django.utils.module_loading import ( autodiscover_modules, import_string, module_has_submodule, @@ -147,11 +146,11 @@ class AutodiscoverModulesTestCase(SimpleTestCase): autodiscover_modules('missing_module') def test_autodiscover_modules_found_but_bad_module(self): - with six.assertRaisesRegex(self, ImportError, "No module named '?a_package_name_that_does_not_exist'?"): + with self.assertRaisesRegex(ImportError, "No module named '?a_package_name_that_does_not_exist'?"): autodiscover_modules('bad_module') def test_autodiscover_modules_several_one_bad_module(self): - with six.assertRaisesRegex(self, ImportError, "No module named '?a_package_name_that_does_not_exist'?"): + with self.assertRaisesRegex(ImportError, "No module named '?a_package_name_that_does_not_exist'?"): autodiscover_modules('good_module', 'bad_module') def test_autodiscover_modules_several_found(self): -- cgit v1.3