Refs #26022 -- Used context manager version of assertRaises in tests.

6 files changed, 40 insertions, 21 deletions

diff --git a/tests/utils_tests/test_baseconv.py b/tests/utils_tests/test_baseconv.py
index 94c2d73b73..bffaac87b4 100644
--- a/tests/utils_tests/test_baseconv.py
+++ b/tests/utils_tests/test_baseconv.py
@@ -42,5 +42,6 @@ class TestBaseConv(TestCase):
         self.assertEqual(base7.decode('ghejd'), -1234)
 
     def test_exception(self):
-        self.assertRaises(ValueError, BaseConverter, 'abc', sign='a')
+        with self.assertRaises(ValueError):
+            BaseConverter('abc', sign='a')
         self.assertIsInstance(BaseConverter('abc', sign='d'), BaseConverter)
diff --git a/tests/utils_tests/test_dateparse.py b/tests/utils_tests/test_dateparse.py
index 1a1111df21..f0585187fc 100644
--- a/tests/utils_tests/test_dateparse.py
+++ b/tests/utils_tests/test_dateparse.py
@@ -17,7 +17,8 @@ class DateParseTests(unittest.TestCase):
         self.assertEqual(parse_date('2012-4-9'), date(2012, 4, 9))
         # Invalid inputs
         self.assertEqual(parse_date('20120423'), None)
-        self.assertRaises(ValueError, parse_date, '2012-04-56')
+        with self.assertRaises(ValueError):
+            parse_date('2012-04-56')
 
     def test_parse_time(self):
         # Valid inputs
@@ -27,7 +28,8 @@ class DateParseTests(unittest.TestCase):
         self.assertEqual(parse_time('4:8:16'), time(4, 8, 16))
         # Invalid inputs
         self.assertEqual(parse_time('091500'), None)
-        self.assertRaises(ValueError, parse_time, '09:15:90')
+        with self.assertRaises(ValueError):
+            parse_time('09:15:90')
 
     def test_parse_datetime(self):
         # Valid inputs
@@ -47,7 +49,8 @@ class DateParseTests(unittest.TestCase):
             datetime(2012, 4, 23, 10, 20, 30, 400000, get_fixed_timezone(-120)))
         # Invalid inputs
         self.assertEqual(parse_datetime('20120423091500'), None)
-        self.assertRaises(ValueError, parse_datetime, '2012-04-56T09:15:90')
+        with self.assertRaises(ValueError):
+            parse_datetime('2012-04-56T09:15:90')
 
 
 class DurationParseTests(unittest.TestCase):
diff --git a/tests/utils_tests/test_encoding.py b/tests/utils_tests/test_encoding.py
index 9527f29dcf..49fe33669f 100644
--- a/tests/utils_tests/test_encoding.py
+++ b/tests/utils_tests/test_encoding.py
@@ -27,7 +27,8 @@ class TestEncodingUtils(unittest.TestCase):
         # str(s) raises a TypeError on python 3 if the result is not a text type.
         # python 2 fails when it tries converting from str to unicode (via ASCII).
         exception = TypeError if six.PY3 else UnicodeError
-        self.assertRaises(exception, force_text, MyString())
+        with self.assertRaises(exception):
+            force_text(MyString())
 
     def test_force_text_lazy(self):
         s = SimpleLazyObject(lambda: 'x')
diff --git a/tests/utils_tests/test_functional.py b/tests/utils_tests/test_functional.py
index 135e8da0ed..66a6f59cf6 100644
--- a/tests/utils_tests/test_functional.py
+++ b/tests/utils_tests/test_functional.py
@@ -55,7 +55,8 @@ class FunctionalTestCase(unittest.TestCase):
             def _get_do(self):
                 return "DO IT"
 
-        self.assertRaises(NotImplementedError, lambda: A().do)
+        with self.assertRaises(NotImplementedError):
+            A().do
         self.assertEqual(B().do, 'DO IT')
 
     def test_lazy_object_to_string(self):
diff --git a/tests/utils_tests/test_http.py b/tests/utils_tests/test_http.py
index 6051818958..6234e269ab 100644
--- a/tests/utils_tests/test_http.py
+++ b/tests/utils_tests/test_http.py
@@ -55,16 +55,21 @@ class TestUtilsHttp(unittest.TestCase):
             self.assertEqual(sys.maxint, http.base36_to_int(http.int_to_base36(sys.maxint)))
 
         # bad input
-        self.assertRaises(ValueError, http.int_to_base36, -1)
+        with self.assertRaises(ValueError):
+            http.int_to_base36(-1)
         if six.PY2:
-            self.assertRaises(ValueError, http.int_to_base36, sys.maxint + 1)
+            with self.assertRaises(ValueError):
+                http.int_to_base36(sys.maxint + 1)
         for n in ['1', 'foo', {1: 2}, (1, 2, 3), 3.141]:
-            self.assertRaises(TypeError, http.int_to_base36, n)
+            with self.assertRaises(TypeError):
+                http.int_to_base36(n)
 
         for n in ['#', ' ']:
-            self.assertRaises(ValueError, http.base36_to_int, n)
+            with self.assertRaises(ValueError):
+                http.base36_to_int(n)
         for n in [123, {1: 2}, (1, 2, 3), 3.141]:
-            self.assertRaises(TypeError, http.base36_to_int, n)
+            with self.assertRaises(TypeError):
+                http.base36_to_int(n)
 
         # more explicit output testing
         for n, b36 in [(0, '0'), (1, '1'), (42, '16'), (818469960, 'django')]:
diff --git a/tests/utils_tests/test_module_loading.py b/tests/utils_tests/test_module_loading.py
index fb9ccbf5d6..7140515cb9 100644
--- a/tests/utils_tests/test_module_loading.py
+++ b/tests/utils_tests/test_module_loading.py
@@ -34,15 +34,18 @@ class DefaultLoader(unittest.TestCase):
 
         # A child that exists, but will generate an import error if loaded
         self.assertTrue(module_has_submodule(test_module, 'bad_module'))
-        self.assertRaises(ImportError, import_module, 'utils_tests.test_module.bad_module')
+        with self.assertRaises(ImportError):
+            import_module('utils_tests.test_module.bad_module')
 
         # A child that doesn't exist
         self.assertFalse(module_has_submodule(test_module, 'no_such_module'))
-        self.assertRaises(ImportError, import_module, 'utils_tests.test_module.no_such_module')
+        with self.assertRaises(ImportError):
+            import_module('utils_tests.test_module.no_such_module')
 
         # A child that doesn't exist, but is the name of a package on the path
         self.assertFalse(module_has_submodule(test_module, 'django'))
-        self.assertRaises(ImportError, import_module, 'utils_tests.test_module.django')
+        with self.assertRaises(ImportError):
+            import_module('utils_tests.test_module.django')
 
         # Don't be confused by caching of import misses
         import types  # NOQA: causes attempted import of utils_tests.types
@@ -50,8 +53,8 @@ class DefaultLoader(unittest.TestCase):
 
         # A module which doesn't have a __path__ (so no submodules)
         self.assertFalse(module_has_submodule(test_no_submodule, 'anything'))
-        self.assertRaises(ImportError, import_module,
-            'utils_tests.test_no_submodule.anything')
+        with self.assertRaises(ImportError):
+            import_module('utils_tests.test_no_submodule.anything')
 
 
 class EggLoader(unittest.TestCase):
@@ -82,11 +85,13 @@ class EggLoader(unittest.TestCase):
 
             # A child that exists, but will generate an import error if loaded
             self.assertTrue(module_has_submodule(egg_module, 'bad_module'))
-            self.assertRaises(ImportError, import_module, 'egg_module.bad_module')
+            with self.assertRaises(ImportError):
+                import_module('egg_module.bad_module')
 
             # A child that doesn't exist
             self.assertFalse(module_has_submodule(egg_module, 'no_such_module'))
-            self.assertRaises(ImportError, import_module, 'egg_module.no_such_module')
+            with self.assertRaises(ImportError):
+                import_module('egg_module.no_such_module')
 
     def test_deep_loader(self):
         "Modules deep inside an egg can still be tested for existence"
@@ -101,11 +106,13 @@ class EggLoader(unittest.TestCase):
 
             # A child that exists, but will generate an import error if loaded
             self.assertTrue(module_has_submodule(egg_module, 'bad_module'))
-            self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.bad_module')
+            with self.assertRaises(ImportError):
+                import_module('egg_module.sub1.sub2.bad_module')
 
             # A child that doesn't exist
             self.assertFalse(module_has_submodule(egg_module, 'no_such_module'))
-            self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.no_such_module')
+            with self.assertRaises(ImportError):
+                import_module('egg_module.sub1.sub2.no_such_module')
 
 
 class ModuleImportTestCase(unittest.TestCase):
@@ -114,7 +121,8 @@ class ModuleImportTestCase(unittest.TestCase):
         self.assertEqual(cls, import_string)
 
         # Test exceptions raised
-        self.assertRaises(ImportError, import_string, 'no_dots_in_path')
+        with self.assertRaises(ImportError):
+            import_string('no_dots_in_path')
         msg = 'Module "utils_tests" does not define a "unexistent" attribute'
         with six.assertRaisesRegex(self, ImportError, msg):
             import_string('utils_tests.unexistent')