Fixed #21288 -- Fixed E126 pep8 warnings

38 files changed, 463 insertions, 451 deletions

diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py
index 0f16fdb81e..e3e6ecb520 100644
--- a/tests/admin_views/models.py
+++ b/tests/admin_views/models.py
@@ -169,10 +169,9 @@ class Sketch(models.Model):
 class Fabric(models.Model):
     NG_CHOICES = (
         ('Textured', (
-                ('x', 'Horizontal'),
-                ('y', 'Vertical'),
-        )
-        ),
+            ('x', 'Horizontal'),
+            ('y', 'Vertical'),
+        )),
         ('plain', 'Smooth'),
     )
     surface = models.CharField(max_length=20, choices=NG_CHOICES)
@@ -390,8 +389,8 @@ class Post(models.Model):
     title = models.CharField(max_length=100, help_text="Some help text for the title (with unicode ŠĐĆŽćžšđ)")
     content = models.TextField(help_text="Some help text for the content (with unicode ŠĐĆŽćžšđ)")
     posted = models.DateField(
-            default=datetime.date.today,
-            help_text="Some help text for the date (with unicode ŠĐĆŽćžšđ)"
+        default=datetime.date.today,
+        help_text="Some help text for the date (with unicode ŠĐĆŽćžšđ)"
     )
     public = models.NullBooleanField()
 
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 438522189a..76a5a92f4b 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -425,12 +425,10 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
                 test=lambda obj, value: obj.chap.book.name == value),
             'chap__book__promo__id__exact': dict(
                 values=[p.id for p in Promo.objects.all()],
-                test=lambda obj, value:
-                    obj.chap.book.promo_set.filter(id=value).exists()),
+                test=lambda obj, value: obj.chap.book.promo_set.filter(id=value).exists()),
             'chap__book__promo__name': dict(
                 values=[p.name for p in Promo.objects.all()],
-                test=lambda obj, value:
-                    obj.chap.book.promo_set.filter(name=value).exists()),
+                test=lambda obj, value: obj.chap.book.promo_set.filter(name=value).exists()),
         }
         for filter_path, params in filters.items():
             for value in params['values']:
@@ -1253,9 +1251,9 @@ class AdminViewPermissionsTest(TestCase):
         response = self.client.get('/test_admin/admin/admin_views/customarticle/%d/delete/' % article_pk)
         self.assertTemplateUsed(response, 'custom_admin/delete_confirmation.html')
         response = self.client.post('/test_admin/admin/admin_views/customarticle/', data={
-                'index': 0,
-                'action': ['delete_selected'],
-                '_selected_action': ['1'],
+            'index': 0,
+            'action': ['delete_selected'],
+            '_selected_action': ['1'],
         })
         self.assertTemplateUsed(response, 'custom_admin/delete_selected_confirmation.html')
         response = self.client.get('/test_admin/admin/admin_views/customarticle/%d/history/' % article_pk)
diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
index 56b5880727..ccc9add36e 100644
--- a/tests/admin_widgets/tests.py
+++ b/tests/admin_widgets/tests.py
@@ -54,8 +54,12 @@ class AdminFormfieldForDBFieldTests(TestCase):
         # Check that we got a field of the right type
         self.assertTrue(
             isinstance(widget, widgetclass),
-            "Wrong widget for %s.%s: expected %s, got %s" %
-                (model.__class__.__name__, fieldname, widgetclass, type(widget))
+            "Wrong widget for %s.%s: expected %s, got %s" % (
+                model.__class__.__name__,
+                fieldname,
+                widgetclass,
+                type(widget),
+            )
         )
 
         # Return the formfield so that other tests can continue
diff --git a/tests/basic/tests.py b/tests/basic/tests.py
index 5d5e93b1e4..195030c714 100644
--- a/tests/basic/tests.py
+++ b/tests/basic/tests.py
@@ -605,8 +605,7 @@ class ModelTest(TestCase):
         )
 
         dicts = Article.objects.filter(
-            pub_date__year=2008).extra(
-                select={'dashed-value': '1'}
+            pub_date__year=2008).extra(select={'dashed-value': '1'}
         ).values('headline', 'dashed-value')
         self.assertEqual([sorted(d.items()) for d in dicts],
             [[('dashed-value', 1), ('headline', 'Article 11')], [('dashed-value', 1), ('headline', 'Article 12')]])
@@ -629,8 +628,7 @@ class ModelTest(TestCase):
         )
 
         articles = Article.objects.filter(
-            pub_date__year=2008).extra(
-                select={'dashed-value': '1', 'undashedvalue': '2'})
+            pub_date__year=2008).extra(select={'dashed-value': '1', 'undashedvalue': '2'})
         self.assertEqual(articles[0].undashedvalue, 2)
 
     def test_create_relation_with_ugettext_lazy(self):
diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index 89c53da6b8..9681c201ed 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -1138,14 +1138,14 @@ class GetCacheTests(unittest.TestCase):
 
 
 @override_settings(
-        CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
-        CACHE_MIDDLEWARE_SECONDS=1,
-        CACHES={
-            'default': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-            },
+    CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
+    CACHE_MIDDLEWARE_SECONDS=1,
+    CACHES={
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
         },
-        USE_I18N=False,
+    },
+    USE_I18N=False,
 )
 class CacheUtils(TestCase):
     """TestCase for django.utils.cache functions."""
@@ -1245,25 +1245,25 @@ class CacheUtils(TestCase):
 
 
 @override_settings(
-        CACHES={
-            'default': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-                'KEY_PREFIX': 'cacheprefix',
-            },
+    CACHES={
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+            'KEY_PREFIX': 'cacheprefix',
         },
+    },
 )
 class PrefixedCacheUtils(CacheUtils):
     pass
 
 
 @override_settings(
-        CACHE_MIDDLEWARE_SECONDS=60,
-        CACHE_MIDDLEWARE_KEY_PREFIX='test',
-        CACHES={
-            'default': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-            },
+    CACHE_MIDDLEWARE_SECONDS=60,
+    CACHE_MIDDLEWARE_KEY_PREFIX='test',
+    CACHES={
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
         },
+    },
 )
 class CacheHEADTest(TestCase):
 
@@ -1318,16 +1318,16 @@ class CacheHEADTest(TestCase):
 
 
 @override_settings(
-        CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
-        CACHES={
-            'default': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-            },
+    CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
+    CACHES={
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
         },
-        LANGUAGES=(
-            ('en', 'English'),
-            ('es', 'Spanish'),
-        ),
+    },
+    LANGUAGES=(
+        ('en', 'English'),
+        ('es', 'Spanish'),
+    ),
 )
 class CacheI18nTest(TestCase):
 
@@ -1496,10 +1496,10 @@ class CacheI18nTest(TestCase):
                     "Cache keys should include the time zone name when time zones are active")
 
     @override_settings(
-            CACHE_MIDDLEWARE_KEY_PREFIX="test",
-            CACHE_MIDDLEWARE_SECONDS=60,
-            USE_ETAGS=True,
-            USE_I18N=True,
+        CACHE_MIDDLEWARE_KEY_PREFIX="test",
+        CACHE_MIDDLEWARE_SECONDS=60,
+        USE_ETAGS=True,
+        USE_I18N=True,
     )
     def test_middleware(self):
         def set_cache(request, lang, msg):
@@ -1560,9 +1560,9 @@ class CacheI18nTest(TestCase):
         translation.deactivate()
 
     @override_settings(
-            CACHE_MIDDLEWARE_KEY_PREFIX="test",
-            CACHE_MIDDLEWARE_SECONDS=60,
-            USE_ETAGS=True,
+        CACHE_MIDDLEWARE_KEY_PREFIX="test",
+        CACHE_MIDDLEWARE_SECONDS=60,
+        USE_ETAGS=True,
     )
     def test_middleware_doesnt_cache_streaming_response(self):
         request = self._get_request()
@@ -1581,12 +1581,12 @@ class CacheI18nTest(TestCase):
         self.assertIsNone(get_cache_data)
 
 @override_settings(
-        CACHES={
-            'default': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-                'KEY_PREFIX': 'cacheprefix'
-            },
+    CACHES={
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+            'KEY_PREFIX': 'cacheprefix'
         },
+    },
 )
 class PrefixedCacheI18nTest(CacheI18nTest):
     pass
@@ -1597,20 +1597,20 @@ def hello_world_view(request, value):
 
 
 @override_settings(
-        CACHE_MIDDLEWARE_ALIAS='other',
-        CACHE_MIDDLEWARE_KEY_PREFIX='middlewareprefix',
-        CACHE_MIDDLEWARE_SECONDS=30,
-        CACHE_MIDDLEWARE_ANONYMOUS_ONLY=False,
-        CACHES={
-            'default': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-            },
-            'other': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-                'LOCATION': 'other',
-                'TIMEOUT': '1',
-            },
+    CACHE_MIDDLEWARE_ALIAS='other',
+    CACHE_MIDDLEWARE_KEY_PREFIX='middlewareprefix',
+    CACHE_MIDDLEWARE_SECONDS=30,
+    CACHE_MIDDLEWARE_ANONYMOUS_ONLY=False,
+    CACHES={
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        },
+        'other': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+            'LOCATION': 'other',
+            'TIMEOUT': '1',
         },
+    },
 )
 class CacheMiddlewareTest(IgnoreDeprecationWarningsMixin, TestCase):
 
@@ -1816,14 +1816,14 @@ class CacheMiddlewareTest(IgnoreDeprecationWarningsMixin, TestCase):
         self.assertEqual(response.content, b'Hello World 16')
 
 @override_settings(
-        CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
-        CACHE_MIDDLEWARE_SECONDS=1,
-        CACHES={
-            'default': {
-                'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-            },
+    CACHE_MIDDLEWARE_KEY_PREFIX='settingsprefix',
+    CACHE_MIDDLEWARE_SECONDS=1,
+    CACHES={
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
         },
-        USE_I18N=False,
+    },
+    USE_I18N=False,
 )
 class TestWithTemplateResponse(TestCase):
     """
diff --git a/tests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py
index 5ce3ee4faf..cb88f60321 100644
--- a/tests/distinct_on_fields/tests.py
+++ b/tests/distinct_on_fields/tests.py
@@ -51,8 +51,7 @@ class DistinctOnTests(TestCase):
                 ['<Staff: p1>', '<Staff: p1>', '<Staff: p2>', '<Staff: p3>'],
             ),
             (
-                Celebrity.objects.filter(fan__in=[self.fan1, self.fan2, self.fan3]).
-                    distinct('name').order_by('name'),
+                Celebrity.objects.filter(fan__in=[self.fan1, self.fan2, self.fan3]).distinct('name').order_by('name'),
                 ['<Celebrity: c1>', '<Celebrity: c2>'],
             ),
             # Does combining querysets work?
diff --git a/tests/extra_regress/tests.py b/tests/extra_regress/tests.py
index 0e6f270ead..2f9366d224 100644
--- a/tests/extra_regress/tests.py
+++ b/tests/extra_regress/tests.py
@@ -13,9 +13,9 @@ class ExtraRegressTests(TestCase):
 
     def setUp(self):
         self.u = User.objects.create_user(
-                    username="fred",
-                    password="secret",
-                    email="fred@example.com"
+            username="fred",
+            password="secret",
+            email="fred@example.com"
         )
 
     def test_regression_7314_7372(self):
@@ -41,9 +41,9 @@ class ExtraRegressTests(TestCase):
 
         # Queryset to match most recent revision:
         qs = RevisionableModel.objects.extra(
-                where=["%(table)s.id IN (SELECT MAX(rev.id) FROM %(table)s rev GROUP BY rev.base_id)" % {
-                    'table': RevisionableModel._meta.db_table,
-                }]
+            where=["%(table)s.id IN (SELECT MAX(rev.id) FROM %(table)s rev GROUP BY rev.base_id)" % {
+                'table': RevisionableModel._meta.db_table,
+            }]
         )
 
         self.assertQuerysetEqual(qs,
@@ -74,8 +74,8 @@ class ExtraRegressTests(TestCase):
         # select portions. Applies when portions are updated or otherwise
         # moved around.
         qs = User.objects.extra(
-                    select=OrderedDict((("alpha", "%s"), ("beta", "2"),  ("gamma", "%s"))),
-                    select_params=(1, 3)
+            select=OrderedDict((("alpha", "%s"), ("beta", "2"),  ("gamma", "%s"))),
+            select_params=(1, 3)
         )
         qs = qs.extra(select={"beta": 4})
         qs = qs.extra(select={"alpha": "%s"}, select_params=[5])
@@ -129,11 +129,11 @@ class ExtraRegressTests(TestCase):
         should still be present because of the extra() call.
         """
         self.assertQuerysetEqual(
-                Order.objects.extra(where=["username=%s"],
-                                    params=["fred"],
-                                    tables=["auth_user"]
-                            ).order_by('created_by'),
-                []
+            Order.objects.extra(where=["username=%s"],
+                                params=["fred"],
+                                tables=["auth_user"]
+            ).order_by('created_by'),
+            []
         )
 
     def test_regression_8819(self):
@@ -294,7 +294,7 @@ class ExtraRegressTests(TestCase):
 
         self.assertQuerysetEqual(
             TestObject.objects.filter(
-                    pk__in=TestObject.objects.extra(select={'extra': 1}).values('pk')
+                pk__in=TestObject.objects.extra(select={'extra': 1}).values('pk')
             ),
             ['<TestObject: TestObject: first,second,third>']
         )
@@ -312,8 +312,7 @@ class ExtraRegressTests(TestCase):
         )
 
         self.assertQuerysetEqual(
-            TestObject.objects.filter(pk=obj.pk) |
-                TestObject.objects.extra(where=["id > %s"], params=[obj.pk]),
+            TestObject.objects.filter(pk=obj.pk) | TestObject.objects.extra(where=["id > %s"], params=[obj.pk]),
             ['<TestObject: TestObject: first,second,third>']
         )
 
diff --git a/tests/file_uploads/tests.py b/tests/file_uploads/tests.py
index 7724578e2a..a0284045bc 100644
--- a/tests/file_uploads/tests.py
+++ b/tests/file_uploads/tests.py
@@ -377,8 +377,7 @@ class FileUploadTests(TestCase):
         vars = {'boundary': 'oUrBoUnDaRyStRiNg'}
         post_data = [
             '--%(boundary)s',
-            'Content-Disposition: form-data; name="file_field"; '
-                'filename="MiXeD_cAsE.txt"',
+            'Content-Disposition: form-data; name="file_field"; filename="MiXeD_cAsE.txt"',
             'Content-Type: application/octet-stream',
             '',
             'file contents\n'
diff --git a/tests/forms_tests/tests/test_fields.py b/tests/forms_tests/tests/test_fields.py
index e04b060916..4c787b1f2f 100644
--- a/tests/forms_tests/tests/test_fields.py
+++ b/tests/forms_tests/tests/test_fields.py
@@ -1134,14 +1134,14 @@ class FieldsTests(SimpleTestCase):
         f.choices = [p for p in f.choices if p[0].endswith('.py')]
         f.choices.sort()
         expected = [
-                ('/django/forms/__init__.py', '__init__.py'),
-                ('/django/forms/fields.py', 'fields.py'),
-                ('/django/forms/forms.py', 'forms.py'),
-                ('/django/forms/formsets.py', 'formsets.py'),
-                ('/django/forms/models.py', 'models.py'),
-                ('/django/forms/util.py', 'util.py'),
-                ('/django/forms/utils.py', 'utils.py'),
-                ('/django/forms/widgets.py', 'widgets.py')
+            ('/django/forms/__init__.py', '__init__.py'),
+            ('/django/forms/fields.py', 'fields.py'),
+            ('/django/forms/forms.py', 'forms.py'),
+            ('/django/forms/formsets.py', 'formsets.py'),
+            ('/django/forms/models.py', 'models.py'),
+            ('/django/forms/util.py', 'util.py'),
+            ('/django/forms/utils.py', 'utils.py'),
+            ('/django/forms/widgets.py', 'widgets.py')
         ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
             self.assertEqual(exp[1], got[1])
@@ -1155,14 +1155,14 @@ class FieldsTests(SimpleTestCase):
         f = FilePathField(path=path, match='^.*?\.py$')
         f.choices.sort()
         expected = [
-                ('/django/forms/__init__.py', '__init__.py'),
-                ('/django/forms/fields.py', 'fields.py'),
-                ('/django/forms/forms.py', 'forms.py'),
-                ('/django/forms/formsets.py', 'formsets.py'),
-                ('/django/forms/models.py', 'models.py'),
-                ('/django/forms/util.py', 'util.py'),
-                ('/django/forms/utils.py', 'utils.py'),
-                ('/django/forms/widgets.py', 'widgets.py')
+            ('/django/forms/__init__.py', '__init__.py'),
+            ('/django/forms/fields.py', 'fields.py'),
+            ('/django/forms/forms.py', 'forms.py'),
+            ('/django/forms/formsets.py', 'formsets.py'),
+            ('/django/forms/models.py', 'models.py'),
+            ('/django/forms/util.py', 'util.py'),
+            ('/django/forms/utils.py', 'utils.py'),
+            ('/django/forms/widgets.py', 'widgets.py')
         ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
             self.assertEqual(exp[1], got[1])
@@ -1174,16 +1174,16 @@ class FieldsTests(SimpleTestCase):
         f = FilePathField(path=path, recursive=True, match='^.*?\.py$')
         f.choices.sort()
         expected = [
-                ('/django/forms/__init__.py', '__init__.py'),
-                ('/django/forms/extras/__init__.py', 'extras/__init__.py'),
-                ('/django/forms/extras/widgets.py', 'extras/widgets.py'),
-                ('/django/forms/fields.py', 'fields.py'),
-                ('/django/forms/forms.py', 'forms.py'),
-                ('/django/forms/formsets.py', 'formsets.py'),
-                ('/django/forms/models.py', 'models.py'),
-                ('/django/forms/util.py', 'util.py'),
-                ('/django/forms/utils.py', 'utils.py'),
-                ('/django/forms/widgets.py', 'widgets.py')
+            ('/django/forms/__init__.py', '__init__.py'),
+            ('/django/forms/extras/__init__.py', 'extras/__init__.py'),
+            ('/django/forms/extras/widgets.py', 'extras/widgets.py'),
+            ('/django/forms/fields.py', 'fields.py'),
+            ('/django/forms/forms.py', 'forms.py'),
+            ('/django/forms/formsets.py', 'formsets.py'),
+            ('/django/forms/models.py', 'models.py'),
+            ('/django/forms/util.py', 'util.py'),
+            ('/django/forms/utils.py', 'utils.py'),
+            ('/django/forms/widgets.py', 'widgets.py')
         ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
             self.assertEqual(exp[1], got[1])
diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py
index 9cb36d66a2..22c2d4258b 100644
--- a/tests/forms_tests/tests/test_widgets.py
+++ b/tests/forms_tests/tests/test_widgets.py
@@ -1182,9 +1182,9 @@ class ClearableFileInputTests(TestCase):
         widget = ClearableFileInput()
         widget.is_required = False
         self.assertEqual(widget.value_from_datadict(
-                data={'myfile-clear': True},
-                files={},
-                name='myfile'), False)
+            data={'myfile-clear': True},
+            files={},
+            name='myfile'), False)
 
     def test_clear_input_checked_returns_false_only_if_not_required(self):
         """
@@ -1196,6 +1196,6 @@ class ClearableFileInputTests(TestCase):
         widget.is_required = True
         f = SimpleUploadedFile('something.txt', b'content')
         self.assertEqual(widget.value_from_datadict(
-                data={'myfile-clear': True},
-                files={'myfile': f},
-                name='myfile'), f)
+            data={'myfile-clear': True},
+            files={'myfile': f},
+            name='myfile'), f)
diff --git a/tests/forms_tests/tests/tests.py b/tests/forms_tests/tests/tests.py
index 256036dbad..361f2dc866 100644
--- a/tests/forms_tests/tests/tests.py
+++ b/tests/forms_tests/tests/tests.py
@@ -124,10 +124,10 @@ class ModelFormCallableModelDefault(TestCase):
         obj2 = ChoiceOptionModel.objects.create(id=2, name='option 2')
         obj3 = ChoiceOptionModel.objects.create(id=3, name='option 3')
         self.assertHTMLEqual(ChoiceFieldForm(initial={
-                'choice': obj2,
-                'choice_int': obj2,
-                'multi_choice': [obj2,obj3],
-                'multi_choice_int': ChoiceOptionModel.objects.exclude(name="default"),
+            'choice': obj2,
+            'choice_int': obj2,
+            'multi_choice': [obj2,obj3],
+            'multi_choice_int': ChoiceOptionModel.objects.exclude(name="default"),
         }).as_p(), """<p><label for="id_choice">Choice:</label> <select name="choice" id="id_choice">
 <option value="1">ChoiceOption 1</option>
 <option value="2" selected="selected">ChoiceOption 2</option>
diff --git a/tests/generic_relations/tests.py b/tests/generic_relations/tests.py
index 9c3ba1767d..60821903d9 100644
--- a/tests/generic_relations/tests.py
+++ b/tests/generic_relations/tests.py
@@ -98,23 +98,23 @@ class GenericRelationsTests(TestCase):
         )
 
         self.assertQuerysetEqual(TaggedItem.objects.all(), [
-                ('clearish', Mineral, quartz.pk),
-                ('fatty', Animal, platypus.pk),
-                ('fatty', Vegetable, bacon.pk),
-                ('hairy', Animal, lion.pk),
-                ('salty', Vegetable, bacon.pk),
-                ('shiny', Animal, platypus.pk),
-                ('yellow', Animal, lion.pk)
+            ('clearish', Mineral, quartz.pk),
+            ('fatty', Animal, platypus.pk),
+            ('fatty', Vegetable, bacon.pk),
+            ('hairy', Animal, lion.pk),
+            ('salty', Vegetable, bacon.pk),
+            ('shiny', Animal, platypus.pk),
+            ('yellow', Animal, lion.pk)
         ],
             comp_func
         )
         lion.delete()
         self.assertQuerysetEqual(TaggedItem.objects.all(), [
-                ('clearish', Mineral, quartz.pk),
-                ('fatty', Animal, platypus.pk),
-                ('fatty', Vegetable, bacon.pk),
-                ('salty', Vegetable, bacon.pk),
-                ('shiny', Animal, platypus.pk)
+            ('clearish', Mineral, quartz.pk),
+            ('fatty', Animal, platypus.pk),
+            ('fatty', Vegetable, bacon.pk),
+            ('salty', Vegetable, bacon.pk),
+            ('shiny', Animal, platypus.pk)
         ],
             comp_func
         )
@@ -124,11 +124,11 @@ class GenericRelationsTests(TestCase):
         quartz_pk = quartz.pk
         quartz.delete()
         self.assertQuerysetEqual(TaggedItem.objects.all(), [
-                ('clearish', Mineral, quartz_pk),
-                ('fatty', Animal, platypus.pk),
-                ('fatty', Vegetable, bacon.pk),
-                ('salty', Vegetable, bacon.pk),
-                ('shiny', Animal, platypus.pk)
+            ('clearish', Mineral, quartz_pk),
+            ('fatty', Animal, platypus.pk),
+            ('fatty', Vegetable, bacon.pk),
+            ('salty', Vegetable, bacon.pk),
+            ('shiny', Animal, platypus.pk)
         ],
             comp_func
         )
@@ -138,10 +138,10 @@ class GenericRelationsTests(TestCase):
         tag.delete()
         self.assertQuerysetEqual(bacon.tags.all(), ["<TaggedItem: salty>"])
         self.assertQuerysetEqual(TaggedItem.objects.all(), [
-                ('clearish', Mineral, quartz_pk),
-                ('fatty', Animal, platypus.pk),
-                ('salty', Vegetable, bacon.pk),
-                ('shiny', Animal, platypus.pk)
+            ('clearish', Mineral, quartz_pk),
+            ('fatty', Animal, platypus.pk),
+            ('salty', Vegetable, bacon.pk),
+            ('shiny', Animal, platypus.pk)
         ],
             comp_func
         )
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index 952a2e5328..b803d638ef 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -600,8 +600,8 @@ class FormattingTests(TransRealMixin, TestCase):
         # Russian locale (with E as month)
         with translation.override('ru', deactivate=True):
             self.assertHTMLEqual(
-                    '<select name="mydate_day" id="id_mydate_day">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31" selected="selected">31</option>\n</select>\n<select name="mydate_month" id="id_mydate_month">\n<option value="1">\u042f\u043d\u0432\u0430\u0440\u044c</option>\n<option value="2">\u0424\u0435\u0432\u0440\u0430\u043b\u044c</option>\n<option value="3">\u041c\u0430\u0440\u0442</option>\n<option value="4">\u0410\u043f\u0440\u0435\u043b\u044c</option>\n<option value="5">\u041c\u0430\u0439</option>\n<option value="6">\u0418\u044e\u043d\u044c</option>\n<option value="7">\u0418\u044e\u043b\u044c</option>\n<option value="8">\u0410\u0432\u0433\u0443\u0441\u0442</option>\n<option value="9">\u0421\u0435\u043d\u0442\u044f\u0431\u0440\u044c</option>\n<option value="10">\u041e\u043a\u0442\u044f\u0431\u0440\u044c</option>\n<option value="11">\u041d\u043e\u044f\u0431\u0440\u044c</option>\n<option value="12" selected="selected">\u0414\u0435\u043a\u0430\u0431\u0440\u044c</option>\n</select>\n<select name="mydate_year" id="id_mydate_year">\n<option value="2009" selected="selected">2009</option>\n<option value="2010">2010</option>\n<option value="2011">2011</option>\n<option value="2012">2012</option>\n<option value="2013">2013</option>\n<option value="2014">2014</option>\n<option value="2015">2015</option>\n<option value="2016">2016</option>\n<option value="2017">2017</option>\n<option value="2018">2018</option>\n</select>',
-                    SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31))
+                '<select name="mydate_day" id="id_mydate_day">\n<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31" selected="selected">31</option>\n</select>\n<select name="mydate_month" id="id_mydate_month">\n<option value="1">\u042f\u043d\u0432\u0430\u0440\u044c</option>\n<option value="2">\u0424\u0435\u0432\u0440\u0430\u043b\u044c</option>\n<option value="3">\u041c\u0430\u0440\u0442</option>\n<option value="4">\u0410\u043f\u0440\u0435\u043b\u044c</option>\n<option value="5">\u041c\u0430\u0439</option>\n<option value="6">\u0418\u044e\u043d\u044c</option>\n<option value="7">\u0418\u044e\u043b\u044c</option>\n<option value="8">\u0410\u0432\u0433\u0443\u0441\u0442</option>\n<option value="9">\u0421\u0435\u043d\u0442\u044f\u0431\u0440\u044c</option>\n<option value="10">\u041e\u043a\u0442\u044f\u0431\u0440\u044c</option>\n<option value="11">\u041d\u043e\u044f\u0431\u0440\u044c</option>\n<option value="12" selected="selected">\u0414\u0435\u043a\u0430\u0431\u0440\u044c</option>\n</select>\n<select name="mydate_year" id="id_mydate_year">\n<option value="2009" selected="selected">2009</option>\n<option value="2010">2010</option>\n<option value="2011">2011</option>\n<option value="2012">2012</option>\n<option value="2013">2013</option>\n<option value="2014">2014</option>\n<option value="2015">2015</option>\n<option value="2016">2016</option>\n<option value="2017">2017</option>\n<option value="2018">2018</option>\n</select>',
+                SelectDateWidget(years=range(2009, 2019)).render('mydate', datetime.date(2009, 12, 31))
             )
 
         # English locale
diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py
index b198e9641a..00fcef2a6d 100644
--- a/tests/logging_tests/tests.py
+++ b/tests/logging_tests/tests.py
@@ -169,8 +169,8 @@ class AdminEmailHandlerTest(TestCase):
         self.assertTrue(admin_email_handler.connection().fail_silently)
 
     @override_settings(
-            ADMINS=(('whatever admin', 'admin@example.com'),),
-            EMAIL_SUBJECT_PREFIX='-SuperAwesomeSubject-'
+        ADMINS=(('whatever admin', 'admin@example.com'),),
+        EMAIL_SUBJECT_PREFIX='-SuperAwesomeSubject-'
     )
     def test_accepts_args(self):
         """
@@ -199,9 +199,9 @@ class AdminEmailHandlerTest(TestCase):
             admin_email_handler.filters = orig_filters
 
     @override_settings(
-            ADMINS=(('whatever admin', 'admin@example.com'),),
-            EMAIL_SUBJECT_PREFIX='-SuperAwesomeSubject-',
-            INTERNAL_IPS=('127.0.0.1',),
+        ADMINS=(('whatever admin', 'admin@example.com'),),
+        EMAIL_SUBJECT_PREFIX='-SuperAwesomeSubject-',
+        INTERNAL_IPS=('127.0.0.1',),
     )
     def test_accepts_args_and_request(self):
         """
@@ -234,9 +234,9 @@ class AdminEmailHandlerTest(TestCase):
             admin_email_handler.filters = orig_filters
 
     @override_settings(
-            ADMINS=(('admin', 'admin@example.com'),),
-            EMAIL_SUBJECT_PREFIX='',
-            DEBUG=False,
+        ADMINS=(('admin', 'admin@example.com'),),
+        EMAIL_SUBJECT_PREFIX='',
+        DEBUG=False,
     )
     def test_subject_accepts_newlines(self):
         """
@@ -257,9 +257,9 @@ class AdminEmailHandlerTest(TestCase):
         self.assertEqual(mail.outbox[0].subject, expected_subject)
 
     @override_settings(
-            ADMINS=(('admin', 'admin@example.com'),),
-            EMAIL_SUBJECT_PREFIX='',
-            DEBUG=False,
+        ADMINS=(('admin', 'admin@example.com'),),
+        EMAIL_SUBJECT_PREFIX='',
+        DEBUG=False,
     )
     def test_truncate_subject(self):
         """
@@ -279,8 +279,8 @@ class AdminEmailHandlerTest(TestCase):
         self.assertEqual(mail.outbox[0].subject, expected_subject)
 
     @override_settings(
-            ADMINS=(('admin', 'admin@example.com'),),
-            DEBUG=False,
+        ADMINS=(('admin', 'admin@example.com'),),
+        DEBUG=False,
     )
     def test_uses_custom_email_backend(self):
         """
diff --git a/tests/mail/tests.py b/tests/mail/tests.py
index ddd851b61b..f169457d1d 100644
--- a/tests/mail/tests.py
+++ b/tests/mail/tests.py
@@ -324,8 +324,8 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
 
         connection = mail.get_connection('mail.custombackend.EmailBackend')
         send_mass_mail([
-                ('Subject1', 'Content1', 'from1@example.com', ['to1@example.com']),
-                ('Subject2', 'Content2', 'from2@example.com', ['to2@example.com']),
+            ('Subject1', 'Content1', 'from1@example.com', ['to1@example.com']),
+            ('Subject2', 'Content2', 'from2@example.com', ['to2@example.com']),
         ], connection=connection)
         self.assertEqual(mail.outbox, [])
         self.assertEqual(len(connection.test_outbox), 2)
diff --git a/tests/managers_regress/tests.py b/tests/managers_regress/tests.py
index e7004b49ed..5534d670d7 100644
--- a/tests/managers_regress/tests.py
+++ b/tests/managers_regress/tests.py
@@ -55,23 +55,23 @@ class ManagersRegressionTests(TestCase):
         # Since Child6 inherits from Child4, the corresponding rows from f1 and
         # f2 also appear here. This is the expected result.
         self.assertQuerysetEqual(Child4._default_manager.order_by('data'), [
-                "<Child4: d1>",
-                "<Child4: d2>",
-                "<Child4: f1>",
-                "<Child4: f2>"
+            "<Child4: d1>",
+            "<Child4: d2>",
+            "<Child4: f1>",
+            "<Child4: f2>"
         ]
         )
         self.assertQuerysetEqual(Child4.manager1.all(), [
-                "<Child4: d1>",
-                "<Child4: f1>"
+            "<Child4: d1>",
+            "<Child4: f1>"
         ],
             ordered=False
         )
         self.assertQuerysetEqual(Child5._default_manager.all(), ["<Child5: fred>"])
         self.assertQuerysetEqual(Child6._default_manager.all(), ["<Child6: f1>"])
         self.assertQuerysetEqual(Child7._default_manager.order_by('name'), [
-                "<Child7: barney>",
-                "<Child7: fred>"
+            "<Child7: barney>",
+            "<Child7: fred>"
         ]
         )
 
diff --git a/tests/many_to_one/tests.py b/tests/many_to_one/tests.py
index 5a60256cc9..2bb5a57344 100644
--- a/tests/many_to_one/tests.py
+++ b/tests/many_to_one/tests.py
@@ -213,9 +213,9 @@ class ManyToOneTests(TestCase):
         self.assertQuerysetEqual(
             Article.objects.filter(reporter__in=[self.r.id,self.r2.id]).distinct(),
             [
-                    "<Article: John's second story>",
-                    "<Article: Paul's story>",
-                    "<Article: This is a test>",
+                "<Article: John's second story>",
+                "<Article: Paul's story>",
+                "<Article: This is a test>",
             ])
         self.assertQuerysetEqual(
             Article.objects.filter(reporter__in=[self.r,self.r2]).distinct(),
@@ -229,8 +229,8 @@ class ManyToOneTests(TestCase):
         # then converted into a query
         self.assertQuerysetEqual(
             Article.objects.filter(
-                        reporter__in=Reporter.objects.filter(first_name='John').values('pk').query
-                    ).distinct(),
+                reporter__in=Reporter.objects.filter(first_name='John').values('pk').query
+            ).distinct(),
             [
                 "<Article: John's second story>",
                 "<Article: This is a test>",
diff --git a/tests/middleware_exceptions/tests.py b/tests/middleware_exceptions/tests.py
index c20fce2c5a..fccfdbbd8c 100644
--- a/tests/middleware_exceptions/tests.py
+++ b/tests/middleware_exceptions/tests.py
@@ -374,7 +374,7 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self._add_middleware(middleware)
         self._add_middleware(pre_middleware)
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [
-                "The view middleware_exceptions.views.null_view didn't return an HttpResponse object.",
+            "The view middleware_exceptions.views.null_view didn't return an HttpResponse object.",
         ],
             ValueError())
 
@@ -391,7 +391,7 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self._add_middleware(middleware)
         self._add_middleware(pre_middleware)
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [
-                "The view middleware_exceptions.views.null_view didn't return an HttpResponse object."
+            "The view middleware_exceptions.views.null_view didn't return an HttpResponse object."
         ],
             ValueError())
 
@@ -685,8 +685,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self._add_middleware(bad_middleware)
         self._add_middleware(pre_middleware)
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [
-                "The view middleware_exceptions.views.null_view didn't return an HttpResponse object.",
-                'Test Response Exception'
+            "The view middleware_exceptions.views.null_view didn't return an HttpResponse object.",
+            'Test Response Exception'
         ])
 
         # Check that the right middleware methods have been invoked
@@ -702,7 +702,7 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self._add_middleware(bad_middleware)
         self._add_middleware(pre_middleware)
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [
-                "The view middleware_exceptions.views.null_view didn't return an HttpResponse object."
+            "The view middleware_exceptions.views.null_view didn't return an HttpResponse object."
         ],
             ValueError())
 
diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py
index 62d23a587a..3651d99ad8 100644
--- a/tests/model_fields/models.py
+++ b/tests/model_fields/models.py
@@ -31,13 +31,13 @@ class Bar(models.Model):
 class Whiz(models.Model):
     CHOICES = (
         ('Group 1', (
-                (1, 'First'),
-                (2, 'Second'),
+            (1, 'First'),
+            (2, 'Second'),
         )
         ),
         ('Group 2', (
-                (3, 'Third'),
-                (4, 'Fourth'),
+            (3, 'Third'),
+            (4, 'Fourth'),
         )
         ),
         (0, 'Other'),
@@ -218,9 +218,9 @@ if Image:
                                  height_field='mugshot_height',
                                  width_field='mugshot_width')
         headshot_height = models.PositiveSmallIntegerField(
-                blank=True, null=True)
+            blank=True, null=True)
         headshot_width = models.PositiveSmallIntegerField(
-                blank=True, null=True)
+            blank=True, null=True)
         headshot = TestImageField(blank=True, null=True,
                                   storage=temp_storage, upload_to='tests',
                                   height_field='headshot_height',
diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py
index fd9d3942d4..4551084eae 100644
--- a/tests/model_forms/tests.py
+++ b/tests/model_forms/tests.py
@@ -679,12 +679,12 @@ class UniqueTest(TestCase):
         isbn = '12345'
         DerivedBook.objects.create(title=title, author=self.writer, isbn=isbn)
         form = DerivedBookForm({
-                    'title': 'Other',
-                    'author': self.writer.pk,
-                    'isbn': '9876',
-                    'suffix1': '0',
-                    'suffix2': '0'
-                })
+            'title': 'Other',
+            'author': self.writer.pk,
+            'isbn': '9876',
+            'suffix1': '0',
+            'suffix2': '0'
+        })
         self.assertFalse(form.is_valid())
         self.assertEqual(len(form.errors), 1)
         self.assertEqual(form.errors['__all__'],
@@ -953,12 +953,12 @@ class OldFormForXTests(TestCase):
         self.assertHTMLEqual(six.text_type(f), '''<tr><th>Name:</th><td><input type="text" name="name" value="Mike Royko" maxlength="50" /><br /><span class="helptext">Use both first and last names.</span></td></tr>''')
 
         art = Article(
-                    headline='Test article',
-                    slug='test-article',
-                    pub_date=datetime.date(1988, 1, 4),
-                    writer=w,
-                    article='Hello.'
-                )
+            headline='Test article',
+            slug='test-article',
+            pub_date=datetime.date(1988, 1, 4),
+            writer=w,
+            article='Hello.'
+        )
         art.save()
         art_id_1 = art.id
         self.assertEqual(art_id_1 is not None, True)
@@ -984,11 +984,11 @@ class OldFormForXTests(TestCase):
 <option value="3">Live</option>
 </select></li>''' % (w_woodward.pk, w_royko.pk, c1.pk, c2.pk, c3.pk))
         f = TestArticleForm({
-                'headline': 'Test headline',
-                'slug': 'test-headline',
-                'pub_date': '1984-02-06',
-                'writer': six.text_type(w_royko.pk),
-                'article': 'Hello.'
+            'headline': 'Test headline',
+            'slug': 'test-headline',
+            'pub_date': '1984-02-06',
+            'writer': six.text_type(w_royko.pk),
+            'article': 'Hello.'
         }, instance=art)
         self.assertEqual(f.errors, {})
         self.assertEqual(f.is_valid(), True)
@@ -999,9 +999,9 @@ class OldFormForXTests(TestCase):
         # You can create a form over a subset of the available fields
         # by specifying a 'fields' argument to form_for_instance.
         f = PartialArticleFormWithSlug({
-                'headline': 'New headline',
-                'slug': 'new-headline',
-                'pub_date': '1988-01-04'
+            'headline': 'New headline',
+            'slug': 'new-headline',
+            'pub_date': '1988-01-04'
         }, auto_id=False, instance=art)
         self.assertHTMLEqual(f.as_ul(), '''<li>Headline: <input type="text" name="headline" value="New headline" maxlength="50" /></li>
 <li>Slug: <input type="text" name="slug" value="new-headline" maxlength="50" /></li>
@@ -1040,11 +1040,11 @@ class OldFormForXTests(TestCase):
 
         # Initial values can be provided for model forms
         f = TestArticleForm(
-                auto_id=False,
-                initial={
-                    'headline': 'Your headline here',
-                    'categories': [str(c1.id), str(c2.id)]
-                })
+            auto_id=False,
+            initial={
+                'headline': 'Your headline here',
+                'categories': [str(c1.id), str(c2.id)]
+            })
         self.assertHTMLEqual(f.as_ul(), '''<li>Headline: <input type="text" name="headline" value="Your headline here" maxlength="50" /></li>
 <li>Slug: <input type="text" name="slug" maxlength="50" /></li>
 <li>Pub date: <input type="text" name="pub_date" /></li>
@@ -1067,12 +1067,12 @@ class OldFormForXTests(TestCase):
 </select></li>''' % (w_woodward.pk, w_royko.pk, c1.pk, c2.pk, c3.pk))
 
         f = TestArticleForm({
-                'headline': 'New headline',
-                'slug': 'new-headline',
-                'pub_date': '1988-01-04',
-                'writer': six.text_type(w_royko.pk),
-                'article': 'Hello.',
-                'categories': [six.text_type(c1.id), six.text_type(c2.id)]
+            'headline': 'New headline',
+            'slug': 'new-headline',
+            'pub_date': '1988-01-04',
+            'writer': six.text_type(w_royko.pk),
+            'article': 'Hello.',
+            'categories': [six.text_type(c1.id), six.text_type(c2.id)]
         }, instance=new_art)
         new_art = f.save()
         self.assertEqual(new_art.id == art_id_1, True)
@@ -1388,8 +1388,8 @@ class OldFormForXTests(TestCase):
         # Upload a file and ensure it all works as expected.
 
         f = TextFileForm(
-                data={'description': 'Assistance'},
-                files={'file': SimpleUploadedFile('test1.txt', b'hello world')})
+            data={'description': 'Assistance'},
+            files={'file': SimpleUploadedFile('test1.txt', b'hello world')})
         self.assertEqual(f.is_valid(), True)
         self.assertEqual(type(f.cleaned_data['file']), SimpleUploadedFile)
         instance = f.save()
@@ -1397,8 +1397,8 @@ class OldFormForXTests(TestCase):
 
         instance.file.delete()
         f = TextFileForm(
-                data={'description': 'Assistance'},
-                files={'file': SimpleUploadedFile('test1.txt', b'hello world')})
+            data={'description': 'Assistance'},
+            files={'file': SimpleUploadedFile('test1.txt', b'hello world')})
         self.assertEqual(f.is_valid(), True)
         self.assertEqual(type(f.cleaned_data['file']), SimpleUploadedFile)
         instance = f.save()
@@ -1406,16 +1406,16 @@ class OldFormForXTests(TestCase):
 
         # Check if the max_length attribute has been inherited from the model.
         f = TextFileForm(
-                data={'description': 'Assistance'},
-                files={'file': SimpleUploadedFile('test-maxlength.txt', b'hello world')})
+            data={'description': 'Assistance'},
+            files={'file': SimpleUploadedFile('test-maxlength.txt', b'hello world')})
         self.assertEqual(f.is_valid(), False)
 
         # Edit an instance that already has the file defined in the model. This will not
         # save the file again, but leave it exactly as it is.
 
         f = TextFileForm(
-                data={'description': 'Assistance'},
-                instance=instance)
+            data={'description': 'Assistance'},
+            instance=instance)
         self.assertEqual(f.is_valid(), True)
         self.assertEqual(f.cleaned_data['file'].name, 'tests/test1.txt')
         instance = f.save()
@@ -1427,8 +1427,8 @@ class OldFormForXTests(TestCase):
         # Override the file by uploading a new one.
 
         f = TextFileForm(
-                data={'description': 'Assistance'},
-                files={'file': SimpleUploadedFile('test2.txt', b'hello world')}, instance=instance)
+            data={'description': 'Assistance'},
+            files={'file': SimpleUploadedFile('test2.txt', b'hello world')}, instance=instance)
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
         self.assertEqual(instance.file.name, 'tests/test2.txt')
@@ -1436,8 +1436,8 @@ class OldFormForXTests(TestCase):
         # Delete the current file since this is not done by Django.
         instance.file.delete()
         f = TextFileForm(
-                data={'description': 'Assistance'},
-                files={'file': SimpleUploadedFile('test2.txt', b'hello world')})
+            data={'description': 'Assistance'},
+            files={'file': SimpleUploadedFile('test2.txt', b'hello world')})
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
         self.assertEqual(instance.file.name, 'tests/test2.txt')
@@ -1455,8 +1455,8 @@ class OldFormForXTests(TestCase):
         self.assertEqual(instance.file.name, '')
 
         f = TextFileForm(
-                data={'description': 'Assistance'},
-                files={'file': SimpleUploadedFile('test3.txt', b'hello world')}, instance=instance)
+            data={'description': 'Assistance'},
+            files={'file': SimpleUploadedFile('test3.txt', b'hello world')}, instance=instance)
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
         self.assertEqual(instance.file.name, 'tests/test3.txt')
@@ -1464,8 +1464,8 @@ class OldFormForXTests(TestCase):
         # Instance can be edited w/out re-uploading the file and existing file should be preserved.
 
         f = TextFileForm(
-                data={'description': 'New Description'},
-                instance=instance)
+            data={'description': 'New Description'},
+            instance=instance)
         f.fields['file'].required = False
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
@@ -1477,8 +1477,8 @@ class OldFormForXTests(TestCase):
         instance.delete()
 
         f = TextFileForm(
-                data={'description': 'Assistance'},
-                files={'file': SimpleUploadedFile('test3.txt', b'hello world')})
+            data={'description': 'Assistance'},
+            files={'file': SimpleUploadedFile('test3.txt', b'hello world')})
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
         self.assertEqual(instance.file.name, 'tests/test3.txt')
@@ -1511,8 +1511,8 @@ class OldFormForXTests(TestCase):
             image_data2 = fp.read()
 
         f = ImageFileForm(
-                data={'description': 'An image'},
-                files={'image': SimpleUploadedFile('test.png', image_data)})
+            data={'description': 'An image'},
+            files={'image': SimpleUploadedFile('test.png', image_data)})
         self.assertEqual(f.is_valid(), True)
         self.assertEqual(type(f.cleaned_data['image']), SimpleUploadedFile)
         instance = f.save()
@@ -1524,8 +1524,8 @@ class OldFormForXTests(TestCase):
         # because the dimension fields are not null=True.
         instance.image.delete(save=False)
         f = ImageFileForm(
-                data={'description': 'An image'},
-                files={'image': SimpleUploadedFile('test.png', image_data)})
+            data={'description': 'An image'},
+            files={'image': SimpleUploadedFile('test.png', image_data)})
         self.assertEqual(f.is_valid(), True)
         self.assertEqual(type(f.cleaned_data['image']), SimpleUploadedFile)
         instance = f.save()
@@ -1550,8 +1550,8 @@ class OldFormForXTests(TestCase):
         # Override the file by uploading a new one.
 
         f = ImageFileForm(
-                data={'description': 'Changed it'},
-                files={'image': SimpleUploadedFile('test2.png', image_data2)}, instance=instance)
+            data={'description': 'Changed it'},
+            files={'image': SimpleUploadedFile('test2.png', image_data2)}, instance=instance)
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
         self.assertEqual(instance.image.name, 'tests/test2.png')
@@ -1564,8 +1564,8 @@ class OldFormForXTests(TestCase):
         instance.delete()
 
         f = ImageFileForm(
-                data={'description': 'Changed it'},
-                files={'image': SimpleUploadedFile('test2.png', image_data2)})
+            data={'description': 'Changed it'},
+            files={'image': SimpleUploadedFile('test2.png', image_data2)})
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
         self.assertEqual(instance.image.name, 'tests/test2.png')
@@ -1593,8 +1593,8 @@ class OldFormForXTests(TestCase):
         self.assertEqual(instance.height, None)
 
         f = OptionalImageFileForm(
-                data={'description': 'And a final one'},
-                files={'image': SimpleUploadedFile('test3.png', image_data)}, instance=instance)
+            data={'description': 'And a final one'},
+            files={'image': SimpleUploadedFile('test3.png', image_data)}, instance=instance)
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
         self.assertEqual(instance.image.name, 'tests/test3.png')
@@ -1603,8 +1603,8 @@ class OldFormForXTests(TestCase):
 
         # Editing the instance without re-uploading the image should not affect the image or its width/height properties
         f = OptionalImageFileForm(
-                data={'description': 'New Description'},
-                instance=instance)
+            data={'description': 'New Description'},
+            instance=instance)
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
         self.assertEqual(instance.description, 'New Description')
@@ -1617,8 +1617,8 @@ class OldFormForXTests(TestCase):
         instance.delete()
 
         f = OptionalImageFileForm(
-                data={'description': 'And a final one'},
-                files={'image': SimpleUploadedFile('test4.png', image_data2)}
+            data={'description': 'And a final one'},
+            files={'image': SimpleUploadedFile('test4.png', image_data2)}
         )
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
@@ -1628,8 +1628,8 @@ class OldFormForXTests(TestCase):
         instance.delete()
         # Test callable upload_to behavior that's dependent on the value of another field in the model
         f = ImageFileForm(
-                data={'description': 'And a final one', 'path': 'foo'},
-                files={'image': SimpleUploadedFile('test4.png', image_data)})
+            data={'description': 'And a final one', 'path': 'foo'},
+            files={'image': SimpleUploadedFile('test4.png', image_data)})
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
         self.assertEqual(instance.image.name, 'foo/test4.png')
diff --git a/tests/model_formsets_regress/tests.py b/tests/model_formsets_regress/tests.py
index 3fd41dddb0..844e1f2820 100644
--- a/tests/model_formsets_regress/tests.py
+++ b/tests/model_formsets_regress/tests.py
@@ -369,25 +369,25 @@ class FormfieldShouldDeleteFormTests(TestCase):
     DeleteFormset = modelformset_factory(User, form=CustomDeleteUserForm, formset=BaseCustomDeleteModelFormSet)
 
     data = {
-            'form-TOTAL_FORMS': '4',
-            'form-INITIAL_FORMS': '0',
-            'form-MAX_NUM_FORMS': '4',
-            'form-0-username': 'John',
-            'form-0-serial': '1',
-            'form-1-username': 'Paul',
-            'form-1-serial': '2',
-            'form-2-username': 'George',
-            'form-2-serial': '3',
-            'form-3-username': 'Ringo',
-            'form-3-serial': '5',
-            }
+        'form-TOTAL_FORMS': '4',
+        'form-INITIAL_FORMS': '0',
+        'form-MAX_NUM_FORMS': '4',
+        'form-0-username': 'John',
+        'form-0-serial': '1',
+        'form-1-username': 'Paul',
+        'form-1-serial': '2',
+        'form-2-username': 'George',
+        'form-2-serial': '3',
+        'form-3-username': 'Ringo',
+        'form-3-serial': '5',
+    }
 
     delete_all_ids = {
-            'form-0-DELETE': '1',
-            'form-1-DELETE': '1',
-            'form-2-DELETE': '1',
-            'form-3-DELETE': '1',
-            }
+        'form-0-DELETE': '1',
+        'form-1-DELETE': '1',
+        'form-2-DELETE': '1',
+        'form-3-DELETE': '1',
+    }
 
     def test_init_database(self):
         """ Add test data to database via formset """
diff --git a/tests/model_inheritance_regress/models.py b/tests/model_inheritance_regress/models.py
index bf076a47c6..6f54dbd650 100644
--- a/tests/model_inheritance_regress/models.py
+++ b/tests/model_inheritance_regress/models.py
@@ -123,8 +123,8 @@ class DerivedM(BaseM):
     derived_name = models.CharField(max_length=100)
 
     def __str__(self):
-        return "PK = %d, base_name = %s, derived_name = %s" \
-                % (self.customPK, self.base_name, self.derived_name)
+        return "PK = %d, base_name = %s, derived_name = %s" % (
+            self.customPK, self.base_name, self.derived_name)
 
 class AuditBase(models.Model):
     planned_date = models.DateField()
diff --git a/tests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py
index 3f903c506b..cd77085fbb 100644
--- a/tests/model_inheritance_regress/tests.py
+++ b/tests/model_inheritance_regress/tests.py
@@ -385,8 +385,8 @@ class ModelInheritanceTest(TestCase):
         # abstract models in the inheritance chain, for consistency with
         # verbose_name.
         self.assertEqual(
-                InternalCertificationAudit._meta.verbose_name_plural,
-                'Audits'
+            InternalCertificationAudit._meta.verbose_name_plural,
+            'Audits'
         )
 
     def test_inherited_nullable_exclude(self):
diff --git a/tests/model_regress/tests.py b/tests/model_regress/tests.py
index 7b901ae327..b631018828 100644
--- a/tests/model_regress/tests.py
+++ b/tests/model_regress/tests.py
@@ -121,16 +121,16 @@ class ModelTests(TestCase):
 
         # Regression test for #18969
         self.assertQuerysetEqual(
-                Party.objects.filter(when__year=1), [
-                        datetime.date(1, 3, 3),
-                ],
-                attrgetter("when")
+            Party.objects.filter(when__year=1), [
+                datetime.date(1, 3, 3),
+            ],
+            attrgetter("when")
         )
         self.assertQuerysetEqual(
-                Party.objects.filter(when__year='1'), [
-                        datetime.date(1, 3, 3),
-                ],
-                attrgetter("when")
+            Party.objects.filter(when__year='1'), [
+                datetime.date(1, 3, 3),
+            ],
+            attrgetter("when")
         )
 
     if (3,) <= sys.version_info < (3, 3) and connection.vendor == 'mysql':
diff --git a/tests/null_queries/tests.py b/tests/null_queries/tests.py
index 0d814a3834..e442479cd7 100644
--- a/tests/null_queries/tests.py
+++ b/tests/null_queries/tests.py
@@ -28,11 +28,11 @@ class NullQueriesTests(TestCase):
 
         # Excluding the previous result returns everything.
         self.assertQuerysetEqual(
-                Choice.objects.exclude(choice=None).order_by('id'),
-                [
-                    '<Choice: Choice: Because. in poll Q: Why? >',
-                    '<Choice: Choice: Why Not? in poll Q: Why? >'
-                ]
+            Choice.objects.exclude(choice=None).order_by('id'),
+            [
+                '<Choice: Choice: Because. in poll Q: Why? >',
+                '<Choice: Choice: Why Not? in poll Q: Why? >'
+            ]
         )
 
         # Valid query, but fails because foo isn't a keyword
diff --git a/tests/pagination/tests.py b/tests/pagination/tests.py
index d4ef272117..000ef0450a 100644
--- a/tests/pagination/tests.py
+++ b/tests/pagination/tests.py
@@ -248,11 +248,11 @@ class ModelPaginationTests(TestCase):
         p = paginator.page(1)
         self.assertEqual("<Page 1 of 2>", six.text_type(p))
         self.assertQuerysetEqual(p.object_list, [
-                "<Article: Article 1>",
-                "<Article: Article 2>",
-                "<Article: Article 3>",
-                "<Article: Article 4>",
-                "<Article: Article 5>"
+            "<Article: Article 1>",
+            "<Article: Article 2>",
+            "<Article: Article 3>",
+            "<Article: Article 4>",
+            "<Article: Article 5>"
         ],
             ordered=False
         )
@@ -269,10 +269,10 @@ class ModelPaginationTests(TestCase):
         p = paginator.page(2)
         self.assertEqual("<Page 2 of 2>", six.text_type(p))
         self.assertQuerysetEqual(p.object_list, [
-                "<Article: Article 6>",
-                "<Article: Article 7>",
-                "<Article: Article 8>",
-                "<Article: Article 9>"
+            "<Article: Article 6>",
+            "<Article: Article 7>",
+            "<Article: Article 8>",
+            "<Article: Article 9>"
         ],
             ordered=False
         )
@@ -302,8 +302,8 @@ class ModelPaginationTests(TestCase):
         # Make sure slicing the Page object with numbers and slice objects work.
         self.assertEqual(p[0], Article.objects.get(headline='Article 1'))
         self.assertQuerysetEqual(p[slice(2)], [
-                "<Article: Article 1>",
-                "<Article: Article 2>",
+            "<Article: Article 1>",
+            "<Article: Article 2>",
         ]
         )
         # After __getitem__ is called, object_list is a list
diff --git a/tests/queries/tests.py b/tests/queries/tests.py
index 4d1b9d3603..952f4eae2f 100644
--- a/tests/queries/tests.py
+++ b/tests/queries/tests.py
@@ -540,7 +540,7 @@ class Queries1Tests(BaseQuerysetTest):
             ['<Author: a1>']
         )
         self.assertQuerysetEqual(
-                Author.objects.filter(Q(extra__note=self.n1)|Q(item__note=self.n3)).filter(id=self.a1.id),
+            Author.objects.filter(Q(extra__note=self.n1)|Q(item__note=self.n3)).filter(id=self.a1.id),
             ['<Author: a1>']
         )
 
diff --git a/tests/requests/tests.py b/tests/requests/tests.py
index aac36442fd..79a3c45b3a 100644
--- a/tests/requests/tests.py
+++ b/tests/requests/tests.py
@@ -298,12 +298,12 @@ class RequestsTests(SimpleTestCase):
         # we don't want the data held in memory twice, and we don't want to
         # silence the error by setting body = '' either.
         payload = FakePayload("\r\n".join([
-                '--boundary',
-                'Content-Disposition: form-data; name="name"',
-                '',
-                'value',
-                '--boundary--'
-                '']))
+            '--boundary',
+            'Content-Disposition: form-data; name="name"',
+            '',
+            'value',
+            '--boundary--'
+            '']))
         request = WSGIRequest({'REQUEST_METHOD': 'POST',
                                'CONTENT_TYPE': 'multipart/form-data; boundary=boundary',
                                'CONTENT_LENGTH': len(payload),
@@ -320,12 +320,12 @@ class RequestsTests(SimpleTestCase):
         # being a binary upload, in which case it should still be accessible
         # via body.
         payload_data = b"\r\n".join([
-                b'--boundary',
-                b'Content-ID: id; name="name"',
-                b'',
-                b'value',
-                b'--boundary--'
-                b''])
+            b'--boundary',
+            b'Content-ID: id; name="name"',
+            b'',
+            b'value',
+            b'--boundary--'
+            b''])
         payload = FakePayload(payload_data)
         request = WSGIRequest({'REQUEST_METHOD': 'POST',
                                'CONTENT_TYPE': 'multipart/related; boundary=boundary',
@@ -343,12 +343,12 @@ class RequestsTests(SimpleTestCase):
         # Every request.POST with Content-Length >= 0 is a valid request,
         # this test ensures that we handle Content-Length == 0.
         payload = FakePayload("\r\n".join([
-                '--boundary',
-                'Content-Disposition: form-data; name="name"',
-                '',
-                'value',
-                '--boundary--'
-                '']))
+            '--boundary',
+            'Content-Disposition: form-data; name="name"',
+            '',
+            'value',
+            '--boundary--'
+            '']))
         request = WSGIRequest({'REQUEST_METHOD': 'POST',
                                'CONTENT_TYPE': 'multipart/form-data; boundary=boundary',
                                'CONTENT_LENGTH': 0,
@@ -413,12 +413,12 @@ class RequestsTests(SimpleTestCase):
         the stream is read second. Using multipart/form-data instead of urlencoded.
         """
         payload = FakePayload("\r\n".join([
-                '--boundary',
-                'Content-Disposition: form-data; name="name"',
-                '',
-                'value',
-                '--boundary--'
-                '']))
+            '--boundary',
+            'Content-Disposition: form-data; name="name"',
+            '',
+            'value',
+            '--boundary--'
+            '']))
         request = WSGIRequest({'REQUEST_METHOD': 'POST',
                                'CONTENT_TYPE': 'multipart/form-data; boundary=boundary',
                                'CONTENT_LENGTH': len(payload),
diff --git a/tests/reverse_single_related/tests.py b/tests/reverse_single_related/tests.py
index 472a3026b6..fd1a5196fe 100644
--- a/tests/reverse_single_related/tests.py
+++ b/tests/reverse_single_related/tests.py
@@ -19,8 +19,8 @@ class ReverseSingleRelatedTests(TestCase):
 
         # Only one source is available via all() due to the custom default manager.
         self.assertQuerysetEqual(
-                Source.objects.all(),
-                ["<Source: Source object>"]
+            Source.objects.all(),
+            ["<Source: Source object>"]
         )
 
         self.assertEqual(public_item.source, public_source)
diff --git a/tests/select_related_regress/tests.py b/tests/select_related_regress/tests.py
index 9982f87ffe..59f4c0d94e 100644
--- a/tests/select_related_regress/tests.py
+++ b/tests/select_related_regress/tests.py
@@ -96,8 +96,8 @@ class SelectRelatedRegressTests(TestCase):
         Item.objects.create(name="item2")
 
         self.assertQuerysetEqual(
-                Item.objects.select_related("child").order_by("name"),
-                ["<Item: item1>", "<Item: item2>"]
+            Item.objects.select_related("child").order_by("name"),
+            ["<Item: item1>", "<Item: item2>"]
         )
 
     def test_regression_12851(self):
diff --git a/tests/serializers_regress/tests.py b/tests/serializers_regress/tests.py
index ad0d19433f..d036c88f40 100644
--- a/tests/serializers_regress/tests.py
+++ b/tests/serializers_regress/tests.py
@@ -556,10 +556,8 @@ def naturalKeyTest(format, self):
     self.assertEqual(books[1].object.pk, None)
 
 
-for format in [
-            f for f in serializers.get_serializer_formats()
-            if not isinstance(serializers.get_serializer(f), serializers.BadSerializer)
-]:
+for format in [f for f in serializers.get_serializer_formats()
+               if not isinstance(serializers.get_serializer(f), serializers.BadSerializer)]:
     setattr(SerializerTests, 'test_' + format + '_serializer', curry(serializerTest, format))
     setattr(SerializerTests, 'test_' + format + '_natural_key_serializer', curry(naturalKeySerializerTest, format))
     setattr(SerializerTests, 'test_' + format + '_serializer_fields', curry(fieldsTest, format))
diff --git a/tests/signing/tests.py b/tests/signing/tests.py
index 8b470b9a38..3486cf0591 100644
--- a/tests/signing/tests.py
+++ b/tests/signing/tests.py
@@ -31,8 +31,8 @@ class TestSigner(TestCase):
         signer = signing.Signer('predictable-secret', salt='extra-salt')
         self.assertEqual(
             signer.signature('hello'),
-                signing.base64_hmac('extra-salt' + 'signer',
-                'hello', 'predictable-secret').decode()
+            signing.base64_hmac('extra-salt' + 'signer',
+                                'hello', 'predictable-secret').decode()
         )
         self.assertNotEqual(
             signing.Signer('predictable-secret', salt='one').signature('hello'),
diff --git a/tests/template_tests/test_loaders.py b/tests/template_tests/test_loaders.py
index 8acfe93a19..ebdac4b9c4 100644
--- a/tests/template_tests/test_loaders.py
+++ b/tests/template_tests/test_loaders.py
@@ -111,7 +111,7 @@ class CachedLoader(unittest.TestCase):
         self.old_TEMPLATE_LOADERS = settings.TEMPLATE_LOADERS
         settings.TEMPLATE_LOADERS = (
             ('django.template.loaders.cached.Loader', (
-                    'django.template.loaders.filesystem.Loader',
+                'django.template.loaders.filesystem.Loader',
             )
             ),
         )
diff --git a/tests/template_tests/test_response.py b/tests/template_tests/test_response.py
index 11e31c9180..e8a9ee8a89 100644
--- a/tests/template_tests/test_response.py
+++ b/tests/template_tests/test_response.py
@@ -150,8 +150,8 @@ class SimpleTemplateResponseTest(TestCase):
         # Create a template response. The context is
         # known to be unpickleable (e.g., a function).
         response = SimpleTemplateResponse('first/test.html', {
-                'value': 123,
-                'fn': datetime.now,
+            'value': 123,
+            'fn': datetime.now,
         })
         self.assertRaises(ContentNotRenderedError,
                           pickle.dumps, response)
@@ -178,8 +178,8 @@ class SimpleTemplateResponseTest(TestCase):
 
     def test_repickling(self):
         response = SimpleTemplateResponse('first/test.html', {
-                'value': 123,
-                'fn': datetime.now,
+            'value': 123,
+            'fn': datetime.now,
         })
         self.assertRaises(ContentNotRenderedError,
                           pickle.dumps, response)
@@ -191,8 +191,8 @@ class SimpleTemplateResponseTest(TestCase):
 
     def test_pickling_cookie(self):
         response = SimpleTemplateResponse('first/test.html', {
-                'value': 123,
-                'fn': datetime.now,
+            'value': 123,
+            'fn': datetime.now,
         })
 
         response.cookies['key'] = 'value'
@@ -284,8 +284,8 @@ class TemplateResponseTest(TestCase):
 
     def test_repickling(self):
         response = SimpleTemplateResponse('first/test.html', {
-                'value': 123,
-                'fn': datetime.now,
+            'value': 123,
+            'fn': datetime.now,
         })
         self.assertRaises(ContentNotRenderedError,
                           pickle.dumps, response)
diff --git a/tests/test_client_regress/tests.py b/tests/test_client_regress/tests.py
index 97c193fd6e..99c90d74df 100644
--- a/tests/test_client_regress/tests.py
+++ b/tests/test_client_regress/tests.py
@@ -1217,10 +1217,10 @@ class UploadedFileEncodingTest(TestCase):
         self.assertEqual(b'Content-Type: text/plain',
                          encode_file('IGNORE', 'IGNORE', DummyFile("file.txt"))[2])
         self.assertIn(encode_file('IGNORE', 'IGNORE', DummyFile("file.zip"))[2], (
-                        b'Content-Type: application/x-compress',
-                        b'Content-Type: application/x-zip',
-                        b'Content-Type: application/x-zip-compressed',
-                        b'Content-Type: application/zip',))
+            b'Content-Type: application/x-compress',
+            b'Content-Type: application/x-zip',
+            b'Content-Type: application/x-zip-compressed',
+            b'Content-Type: application/zip',))
         self.assertEqual(b'Content-Type: application/octet-stream',
                          encode_file('IGNORE', 'IGNORE', DummyFile("file.unknown"))[2])
 
diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py
index 76b9baa378..79fdcaa971 100644
--- a/tests/timezones/tests.py
+++ b/tests/timezones/tests.py
@@ -208,51 +208,57 @@ class LegacyDatabaseTests(TestCase):
         morning_min_dt = datetime.datetime(2011, 9, 1, 3, 20, 40)
         afternoon_min_dt = datetime.datetime(2011, 9, 1, 13, 20, 30)
         self.assertQuerysetEqual(
-                Session.objects.annotate(dt=Min('events__dt')).order_by('dt'),
-                [morning_min_dt, afternoon_min_dt],
-                transform=lambda d: d.dt)
+            Session.objects.annotate(dt=Min('events__dt')).order_by('dt'),
+            [morning_min_dt, afternoon_min_dt],
+            transform=lambda d: d.dt)
         self.assertQuerysetEqual(
-                Session.objects.annotate(dt=Min('events__dt')).filter(dt__lt=afternoon_min_dt),
-                [morning_min_dt],
-                transform=lambda d: d.dt)
+            Session.objects.annotate(dt=Min('events__dt')).filter(dt__lt=afternoon_min_dt),
+            [morning_min_dt],
+            transform=lambda d: d.dt)
         self.assertQuerysetEqual(
-                Session.objects.annotate(dt=Min('events__dt')).filter(dt__gte=afternoon_min_dt),
-                [afternoon_min_dt],
-                transform=lambda d: d.dt)
+            Session.objects.annotate(dt=Min('events__dt')).filter(dt__gte=afternoon_min_dt),
+            [afternoon_min_dt],
+            transform=lambda d: d.dt)
 
     def test_query_datetimes(self):
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0))
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 4, 30, 0))
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'year'),
-                [datetime.datetime(2011, 1, 1, 0, 0, 0)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'month'),
-                [datetime.datetime(2011, 1, 1, 0, 0, 0)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'day'),
-                [datetime.datetime(2011, 1, 1, 0, 0, 0)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'hour'),
-                [datetime.datetime(2011, 1, 1, 1, 0, 0),
-                 datetime.datetime(2011, 1, 1, 4, 0, 0)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'minute'),
-                [datetime.datetime(2011, 1, 1, 1, 30, 0),
-                 datetime.datetime(2011, 1, 1, 4, 30, 0)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'second'),
-                [datetime.datetime(2011, 1, 1, 1, 30, 0),
-                 datetime.datetime(2011, 1, 1, 4, 30, 0)],
-                transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'year'),
+            [datetime.datetime(2011, 1, 1, 0, 0, 0)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'month'),
+            [datetime.datetime(2011, 1, 1, 0, 0, 0)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'day'),
+            [datetime.datetime(2011, 1, 1, 0, 0, 0)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'hour'),
+            [datetime.datetime(2011, 1, 1, 1, 0, 0),
+             datetime.datetime(2011, 1, 1, 4, 0, 0)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'minute'),
+            [datetime.datetime(2011, 1, 1, 1, 30, 0),
+             datetime.datetime(2011, 1, 1, 4, 30, 0)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'second'),
+            [datetime.datetime(2011, 1, 1, 1, 30, 0),
+             datetime.datetime(2011, 1, 1, 4, 30, 0)],
+            transform=lambda d: d)
 
     def test_raw_sql(self):
         # Regression test for #17755
         dt = datetime.datetime(2011, 9, 1, 13, 20, 30)
         event = Event.objects.create(dt=dt)
         self.assertQuerysetEqual(
-                Event.objects.raw('SELECT * FROM timezones_event WHERE dt = %s', [dt]),
-                [event],
-                transform=lambda d: d)
+            Event.objects.raw('SELECT * FROM timezones_event WHERE dt = %s', [dt]),
+            [event],
+            transform=lambda d: d)
 
     def test_filter_date_field_with_aware_datetime(self):
         # Regression test for #17742
@@ -456,82 +462,94 @@ class NewDatabaseTests(TestCase):
         morning_min_dt = datetime.datetime(2011, 9, 1, 3, 20, 40, tzinfo=EAT)
         afternoon_min_dt = datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT)
         self.assertQuerysetEqual(
-                Session.objects.annotate(dt=Min('events__dt')).order_by('dt'),
-                [morning_min_dt, afternoon_min_dt],
-                transform=lambda d: d.dt)
+            Session.objects.annotate(dt=Min('events__dt')).order_by('dt'),
+            [morning_min_dt, afternoon_min_dt],
+            transform=lambda d: d.dt)
         self.assertQuerysetEqual(
-                Session.objects.annotate(dt=Min('events__dt')).filter(dt__lt=afternoon_min_dt),
-                [morning_min_dt],
-                transform=lambda d: d.dt)
+            Session.objects.annotate(dt=Min('events__dt')).filter(dt__lt=afternoon_min_dt),
+            [morning_min_dt],
+            transform=lambda d: d.dt)
         self.assertQuerysetEqual(
-                Session.objects.annotate(dt=Min('events__dt')).filter(dt__gte=afternoon_min_dt),
-                [afternoon_min_dt],
-                transform=lambda d: d.dt)
+            Session.objects.annotate(dt=Min('events__dt')).filter(dt__gte=afternoon_min_dt),
+            [afternoon_min_dt],
+            transform=lambda d: d.dt)
 
     @skipUnlessDBFeature('has_zoneinfo_database')
     def test_query_datetimes(self):
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT))
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT))
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'year'),
-                [datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=EAT)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'month'),
-                [datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=EAT)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'day'),
-                [datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=EAT)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'hour'),
-                [datetime.datetime(2011, 1, 1, 1, 0, 0, tzinfo=EAT),
-                 datetime.datetime(2011, 1, 1, 4, 0, 0, tzinfo=EAT)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'minute'),
-                [datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT),
-                 datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT)],
-                transform=lambda d: d)
-        self.assertQuerysetEqual(Event.objects.datetimes('dt', 'second'),
-                [datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT),
-                 datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT)],
-                transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'year'),
+            [datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=EAT)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'month'),
+            [datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=EAT)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'day'),
+            [datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=EAT)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'hour'),
+            [datetime.datetime(2011, 1, 1, 1, 0, 0, tzinfo=EAT),
+             datetime.datetime(2011, 1, 1, 4, 0, 0, tzinfo=EAT)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'minute'),
+            [datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT),
+             datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT)],
+            transform=lambda d: d)
+        self.assertQuerysetEqual(
+            Event.objects.datetimes('dt', 'second'),
+            [datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT),
+             datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT)],
+            transform=lambda d: d)
 
     @skipUnlessDBFeature('has_zoneinfo_database')
     def test_query_datetimes_in_other_timezone(self):
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=EAT))
         Event.objects.create(dt=datetime.datetime(2011, 1, 1, 4, 30, 0, tzinfo=EAT))
         with timezone.override(UTC):
-            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'year'),
-                    [datetime.datetime(2010, 1, 1, 0, 0, 0, tzinfo=UTC),
-                     datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=UTC)],
-                    transform=lambda d: d)
-            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'month'),
-                    [datetime.datetime(2010, 12, 1, 0, 0, 0, tzinfo=UTC),
-                     datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=UTC)],
-                    transform=lambda d: d)
-            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'day'),
-                    [datetime.datetime(2010, 12, 31, 0, 0, 0, tzinfo=UTC),
-                     datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=UTC)],
-                    transform=lambda d: d)
-            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'hour'),
-                    [datetime.datetime(2010, 12, 31, 22, 0, 0, tzinfo=UTC),
-                     datetime.datetime(2011, 1, 1, 1, 0, 0, tzinfo=UTC)],
-                    transform=lambda d: d)
-            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'minute'),
-                    [datetime.datetime(2010, 12, 31, 22, 30, 0, tzinfo=UTC),
-                     datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=UTC)],
-                    transform=lambda d: d)
-            self.assertQuerysetEqual(Event.objects.datetimes('dt', 'second'),
-                    [datetime.datetime(2010, 12, 31, 22, 30, 0, tzinfo=UTC),
-                     datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=UTC)],
-                    transform=lambda d: d)
+            self.assertQuerysetEqual(
+                Event.objects.datetimes('dt', 'year'),
+                [datetime.datetime(2010, 1, 1, 0, 0, 0, tzinfo=UTC),
+                 datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=UTC)],
+                transform=lambda d: d)
+            self.assertQuerysetEqual(
+                Event.objects.datetimes('dt', 'month'),
+                [datetime.datetime(2010, 12, 1, 0, 0, 0, tzinfo=UTC),
+                 datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=UTC)],
+                transform=lambda d: d)
+            self.assertQuerysetEqual(
+                Event.objects.datetimes('dt', 'day'),
+                [datetime.datetime(2010, 12, 31, 0, 0, 0, tzinfo=UTC),
+                 datetime.datetime(2011, 1, 1, 0, 0, 0, tzinfo=UTC)],
+                transform=lambda d: d)
+            self.assertQuerysetEqual(
+                Event.objects.datetimes('dt', 'hour'),
+                [datetime.datetime(2010, 12, 31, 22, 0, 0, tzinfo=UTC),
+                 datetime.datetime(2011, 1, 1, 1, 0, 0, tzinfo=UTC)],
+                transform=lambda d: d)
+            self.assertQuerysetEqual(
+                Event.objects.datetimes('dt', 'minute'),
+                [datetime.datetime(2010, 12, 31, 22, 30, 0, tzinfo=UTC),
+                 datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=UTC)],
+                transform=lambda d: d)
+            self.assertQuerysetEqual(
+                Event.objects.datetimes('dt', 'second'),
+                [datetime.datetime(2010, 12, 31, 22, 30, 0, tzinfo=UTC),
+                 datetime.datetime(2011, 1, 1, 1, 30, 0, tzinfo=UTC)],
+                transform=lambda d: d)
 
     def test_raw_sql(self):
         # Regression test for #17755
         dt = datetime.datetime(2011, 9, 1, 13, 20, 30, tzinfo=EAT)
         event = Event.objects.create(dt=dt)
         self.assertQuerysetEqual(
-                Event.objects.raw('SELECT * FROM timezones_event WHERE dt = %s', [dt]),
-                [event],
-                transform=lambda d: d)
+            Event.objects.raw('SELECT * FROM timezones_event WHERE dt = %s', [dt]),
+            [event],
+            transform=lambda d: d)
 
     @requires_tz_support
     def test_filter_date_field_with_aware_datetime(self):
diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py
index a66ffe44ba..8c0c535d31 100644
--- a/tests/transactions/tests.py
+++ b/tests/transactions/tests.py
@@ -203,7 +203,7 @@ class AtomicTests(TransactionTestCase):
             with self.assertRaises(DatabaseError):
                 with transaction.atomic(savepoint=False):
                     connection.cursor().execute(
-                            "SELECT no_such_col FROM transactions_reporter")
+                        "SELECT no_such_col FROM transactions_reporter")
             # prevent atomic from rolling back since we're recovering manually
             self.assertTrue(transaction.get_rollback())
             transaction.set_rollback(False)
diff --git a/tests/utils_tests/test_tzinfo.py b/tests/utils_tests/test_tzinfo.py
index 31fd7c4a50..43522bb1d0 100644
--- a/tests/utils_tests/test_tzinfo.py
+++ b/tests/utils_tests/test_tzinfo.py
@@ -61,14 +61,14 @@ class TzinfoTests(IgnorePendingDeprecationWarningsMixin, unittest.TestCase):
         # US/Eastern -- we force its representation to "EST"
         tz = LocalTimezone(dt + datetime.timedelta(days=1))
         self.assertEqual(
-                repr(datetime.datetime.fromtimestamp(ts - 3600, tz)),
-                'datetime.datetime(2010, 11, 7, 0, 0, tzinfo=EST)')
+            repr(datetime.datetime.fromtimestamp(ts - 3600, tz)),
+            'datetime.datetime(2010, 11, 7, 0, 0, tzinfo=EST)')
         self.assertEqual(
-                repr(datetime.datetime.fromtimestamp(ts, tz)),
-                'datetime.datetime(2010, 11, 7, 1, 0, tzinfo=EST)')
+            repr(datetime.datetime.fromtimestamp(ts, tz)),
+            'datetime.datetime(2010, 11, 7, 1, 0, tzinfo=EST)')
         self.assertEqual(
-                repr(datetime.datetime.fromtimestamp(ts + 3600, tz)),
-                'datetime.datetime(2010, 11, 7, 1, 0, tzinfo=EST)')
+            repr(datetime.datetime.fromtimestamp(ts + 3600, tz)),
+            'datetime.datetime(2010, 11, 7, 1, 0, tzinfo=EST)')
 
     def test_copy(self):
         now = datetime.datetime.now()