Partial revert of 165f44aa.

That commit didn't always improve readability.

See discussion on django-developers for details.

django/contrib/humanize/tests.py

@@ -90,9 +90,9 @@ class HumanizeTests(TransRealMixin, TestCase):
                        '100', '1,000', '10,123', '10,311', '1,000,000', '1,234,567.1234567', '1,234,567.1234567',
                      None)
 
-        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=False), \
-                translation.override('en'):
-            self.humanize_tester(test_list, result_list, 'intcomma')
+        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=False):
+            with translation.override('en'):
+                self.humanize_tester(test_list, result_list, 'intcomma')
 
     def test_intcomma_without_number_grouping(self):
         # Regression for #17414
@@ -116,18 +116,18 @@ class HumanizeTests(TransRealMixin, TestCase):
                      '100', '1000', '10123', '10311', '1000000', None)
         result_list = ('100', '1.000', '10.123', '10.311', '1.000.000', '1.234.567,25',
                        '100', '1.000', '10.123', '10.311', '1.000.000', None)
-        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True), \
-                translation.override('de'):
-            self.humanize_tester(test_list, result_list, 'intcomma')
+        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True):
+            with translation.override('de'):
+                self.humanize_tester(test_list, result_list, 'intcomma')
 
     def test_i18n_intword(self):
         test_list = ('100', '1000000', '1200000', '1290000',
                      '1000000000', '2000000000', '6000000000000')
         result_list = ('100', '1,0 Million', '1,2 Millionen', '1,3 Millionen',
                        '1,0 Milliarde', '2,0 Milliarden', '6,0 Billionen')
-        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True), \
-                translation.override('de'):
-            self.humanize_tester(test_list, result_list, 'intword')
+        with self.settings(USE_L10N=True, USE_THOUSAND_SEPARATOR=True):
+            with translation.override('de'):
+                self.humanize_tester(test_list, result_list, 'intword')
 
     def test_apnumber(self):
         test_list = [str(x) for x in range(1, 11)]
@@ -174,9 +174,9 @@ class HumanizeTests(TransRealMixin, TestCase):
 
         orig_humanize_datetime, humanize.datetime = humanize.datetime, MockDateTime
         try:
-            with override_settings(TIME_ZONE="America/Chicago", USE_TZ=True), \
-                    translation.override('en'):
-                self.humanize_tester([dt], ['yesterday'], 'naturalday')
+            with override_settings(TIME_ZONE="America/Chicago", USE_TZ=True):
+                with translation.override('en'):
+                    self.humanize_tester([dt], ['yesterday'], 'naturalday')
         finally:
             humanize.datetime = orig_humanize_datetime
 

tests/i18n/tests.py

@@ -745,11 +745,11 @@ class FormattingTests(TransRealMixin, TestCase):
             self.assertEqual('.', get_format('DECIMAL_SEPARATOR', lang='en'))
 
     def test_get_format_modules_stability(self):
-        with self.settings(FORMAT_MODULE_PATH='i18n.other.locale'), \
-                translation.override('de', deactivate=True):
-            old = str("%r") % get_format_modules(reverse=True)
-            new = str("%r") % get_format_modules(reverse=True) # second try
-            self.assertEqual(new, old, 'Value returned by get_formats_modules() must be preserved between calls.')
+        with self.settings(FORMAT_MODULE_PATH='i18n.other.locale'):
+            with translation.override('de', deactivate=True):
+                old = str("%r") % get_format_modules(reverse=True)
+                new = str("%r") % get_format_modules(reverse=True) # second try
+                self.assertEqual(new, old, 'Value returned by get_formats_modules() must be preserved between calls.')
 
     def test_localize_templatetag_and_filter(self):
         """

tests/one_to_one_regress/tests.py

@@ -141,10 +141,12 @@ class OneToOneRegressionTests(TestCase):
         """
         p = Place(name='Zombie Cats', address='Not sure')
         p.save()
-        with self.assertNumQueries(1), self.assertRaises(Restaurant.DoesNotExist):
-            p.restaurant
-        with self.assertNumQueries(0), self.assertRaises(Restaurant.DoesNotExist):
-            p.restaurant
+        with self.assertNumQueries(1):
+            with self.assertRaises(Restaurant.DoesNotExist):
+                p.restaurant
+        with self.assertNumQueries(0):
+            with self.assertRaises(Restaurant.DoesNotExist):
+                p.restaurant
 
     def test_reverse_object_cached_when_related_is_accessed(self):
         """
@@ -197,8 +199,9 @@ class OneToOneRegressionTests(TestCase):
             self.assertEqual(self.p1.undergroundbar, b)
         b.place = None
         b.save()
-        with self.assertNumQueries(0), self.assertRaises(UndergroundBar.DoesNotExist):
-            self.p1.undergroundbar
+        with self.assertNumQueries(0):
+            with self.assertRaises(UndergroundBar.DoesNotExist):
+                self.p1.undergroundbar
 
     def test_get_reverse_on_unsaved_object(self):
         """
@@ -210,21 +213,24 @@ class OneToOneRegressionTests(TestCase):
         p = Place()
 
         # When there's no instance of the origin of the one-to-one
-        with self.assertNumQueries(0), self.assertRaises(UndergroundBar.DoesNotExist):
-            p.undergroundbar
+        with self.assertNumQueries(0):
+            with self.assertRaises(UndergroundBar.DoesNotExist):
+                p.undergroundbar
 
         UndergroundBar.objects.create()
 
         # When there's one instance of the origin
         # (p.undergroundbar used to return that instance)
-        with self.assertNumQueries(0), self.assertRaises(UndergroundBar.DoesNotExist):
-            p.undergroundbar
+        with self.assertNumQueries(0):
+            with self.assertRaises(UndergroundBar.DoesNotExist):
+                p.undergroundbar
 
         UndergroundBar.objects.create()
 
         # When there are several instances of the origin
-        with self.assertNumQueries(0), self.assertRaises(UndergroundBar.DoesNotExist):
-            p.undergroundbar
+        with self.assertNumQueries(0):
+            with self.assertRaises(UndergroundBar.DoesNotExist):
+                p.undergroundbar
 
     def test_set_reverse_on_unsaved_object(self):
         """
@@ -233,8 +239,9 @@ class OneToOneRegressionTests(TestCase):
         """
         p = Place()
         b = UndergroundBar.objects.create()
-        with self.assertNumQueries(0), self.assertRaises(ValueError):
-            p.undergroundbar = b
+        with self.assertNumQueries(0):
+            with self.assertRaises(ValueError):
+                p.undergroundbar = b
 
     def test_nullable_o2o_delete(self):
         u = UndergroundBar.objects.create(place=self.p1)

tests/test_utils/tests.py

@@ -152,8 +152,9 @@ class CaptureQueriesContextManagerTests(TestCase):
         self.assertEqual(2, len(captured_queries))
 
     def test_failure(self):
-        with self.assertRaises(TypeError), CaptureQueriesContext(connection):
-            raise TypeError
+        with self.assertRaises(TypeError):
+            with CaptureQueriesContext(connection):
+                raise TypeError
 
     def test_with_client(self):
         with CaptureQueriesContext(connection) as captured_queries:
@@ -189,12 +190,14 @@ class AssertNumQueriesContextManagerTests(TestCase):
             Person.objects.count()
 
     def test_failure(self):
-        with self.assertRaises(AssertionError) as exc_info, self.assertNumQueries(2):
-            Person.objects.count()
+        with self.assertRaises(AssertionError) as exc_info:
+            with self.assertNumQueries(2):
+                Person.objects.count()
         self.assertIn("1 queries executed, 2 expected", str(exc_info.exception))
 
-        with self.assertRaises(TypeError), self.assertNumQueries(4000):
-            raise TypeError
+        with self.assertRaises(TypeError):
+            with self.assertNumQueries(4000):
+                raise TypeError
 
     def test_with_client(self):
         person = Person.objects.create(name="test")
@@ -229,13 +232,13 @@ class AssertTemplateUsedContextManagerTests(TestCase):
             render_to_string('template_used/base.html')
 
     def test_nested_usage(self):
-        with self.assertTemplateUsed('template_used/base.html'), \
-                self.assertTemplateUsed('template_used/include.html'):
-            render_to_string('template_used/include.html')
+        with self.assertTemplateUsed('template_used/base.html'):
+            with self.assertTemplateUsed('template_used/include.html'):
+                render_to_string('template_used/include.html')
 
-        with self.assertTemplateUsed('template_used/extends.html'), \
-                self.assertTemplateUsed('template_used/base.html'):
-            render_to_string('template_used/extends.html')
+        with self.assertTemplateUsed('template_used/extends.html'):
+            with self.assertTemplateUsed('template_used/base.html'):
+                render_to_string('template_used/extends.html')
 
         with self.assertTemplateUsed('template_used/base.html'):
             with self.assertTemplateUsed('template_used/alternative.html'):
@@ -255,34 +258,38 @@ class AssertTemplateUsedContextManagerTests(TestCase):
             pass
 
     def test_error_message(self):
-        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html'), \
-                self.assertTemplateUsed('template_used/base.html'):
-            pass
+        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html'):
+            with self.assertTemplateUsed('template_used/base.html'):
+                pass
 
-        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html'), \
-                self.assertTemplateUsed(template_name='template_used/base.html'):
-            pass
+        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html'):
+            with self.assertTemplateUsed(template_name='template_used/base.html'):
+                pass
 
-        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html.*template_used/alternative\.html$'), \
-                self.assertTemplateUsed('template_used/base.html'):
-            render_to_string('template_used/alternative.html')
+        with six.assertRaisesRegex(self, AssertionError, r'^template_used/base\.html.*template_used/alternative\.html$'):
+            with self.assertTemplateUsed('template_used/base.html'):
+                render_to_string('template_used/alternative.html')
 
     def test_failure(self):
-        with self.assertRaises(TypeError), self.assertTemplateUsed():
-            pass
+        with self.assertRaises(TypeError):
+            with self.assertTemplateUsed():
+                pass
 
-        with self.assertRaises(AssertionError), self.assertTemplateUsed(''):
-            pass
+        with self.assertRaises(AssertionError):
+            with self.assertTemplateUsed(''):
+                pass
 
-        with self.assertRaises(AssertionError), self.assertTemplateUsed(''):
-            render_to_string('template_used/base.html')
+        with self.assertRaises(AssertionError):
+            with self.assertTemplateUsed(''):
+                render_to_string('template_used/base.html')
 
-        with self.assertRaises(AssertionError), self.assertTemplateUsed(template_name=''):
-            pass
+        with self.assertRaises(AssertionError):
+            with self.assertTemplateUsed(template_name=''):
+                pass
 
-        with self.assertRaises(AssertionError), \
-                self.assertTemplateUsed('template_used/base.html'):
-            render_to_string('template_used/alternative.html')
+        with self.assertRaises(AssertionError):
+            with self.assertTemplateUsed('template_used/base.html'):
+                render_to_string('template_used/alternative.html')
 
 
 class HTMLEqualTests(TestCase):

tests/view_tests/tests/test_i18n.py

@@ -116,10 +116,10 @@ class JsI18NTests(TestCase):
         with the proper English translations. See #13726 for more details.
         """
         extended_apps = list(settings.INSTALLED_APPS) + ['view_tests.app0']
-        with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps), \
-                override('en-us'):
-            response = self.client.get('/views/jsi18n_english_translation/')
-            self.assertContains(response, javascript_quote('this app0 string is to be translated'))
+        with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps):
+            with override('en-us'):
+                response = self.client.get('/views/jsi18n_english_translation/')
+                self.assertContains(response, javascript_quote('this app0 string is to be translated'))
 
     def testI18NLanguageNonEnglishFallback(self):
         """
@@ -145,11 +145,10 @@ class JsI18NTestsMultiPackage(TestCase):
         #3594 and #13514 for more details.
         """
         extended_apps = list(settings.INSTALLED_APPS) + ['view_tests.app1', 'view_tests.app2']
-        with self.settings(LANGUAGE_CODE='en-us', INSTALLED_APPS=extended_apps), \
-                override('fr'):
-            response = self.client.get('/views/jsi18n_multi_packages1/')
-            self.assertContains(response,
-                javascript_quote('il faut traduire cette chaîne de caractères de app1'))
+        with self.settings(LANGUAGE_CODE='en-us', INSTALLED_APPS=extended_apps):
+            with override('fr'):
+                response = self.client.get('/views/jsi18n_multi_packages1/')
+                self.assertContains(response, javascript_quote('il faut traduire cette chaîne de caractères de app1'))
 
     def testI18NDifferentNonEnLangs(self):
         """
@@ -157,21 +156,20 @@ class JsI18NTestsMultiPackage(TestCase):
         English.
         """
         extended_apps = list(settings.INSTALLED_APPS) + ['view_tests.app3', 'view_tests.app4']
-        with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps), \
-                override('es-ar'):
-            response = self.client.get('/views/jsi18n_multi_packages2/')
-            self.assertContains(response,
-                javascript_quote('este texto de app3 debe ser traducido'))
+        with self.settings(LANGUAGE_CODE='fr', INSTALLED_APPS=extended_apps):
+            with override('es-ar'):
+                response = self.client.get('/views/jsi18n_multi_packages2/')
+                self.assertContains(response, javascript_quote('este texto de app3 debe ser traducido'))
 
     def testI18NWithLocalePaths(self):
         extended_locale_paths = settings.LOCALE_PATHS + (
             path.join(path.dirname(
                 path.dirname(path.abspath(upath(__file__)))), 'app3', 'locale'),)
-        with self.settings(LANGUAGE_CODE='es-ar', LOCALE_PATHS=extended_locale_paths), \
-                override('es-ar'):
-            response = self.client.get('/views/jsi18n/')
-            self.assertContains(response,
-                javascript_quote('este texto de app3 debe ser traducido'))
+        with self.settings(LANGUAGE_CODE='es-ar', LOCALE_PATHS=extended_locale_paths):
+            with override('es-ar'):
+                response = self.client.get('/views/jsi18n/')
+                self.assertContains(response,
+                    javascript_quote('este texto de app3 debe ser traducido'))
 
 
 skip_selenium = not os.environ.get('DJANGO_SELENIUM_TESTS', False)