[1.7.x] Corrected many style guide violations that the newest version of flake8 catches

Backport of 778ce245dd466bce1b19f89e52cf9ed8f1b46513 from master

7 files changed, 8 insertions, 7 deletions

diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 6e0c08c1ec..67568282da 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -1414,7 +1414,7 @@ class AdminViewPermissionsTest(TestCase):
         self.client.get('/test_admin/admin/')
         self.client.post(login_url, self.deleteuser_login)
         response = self.client.get('/test_admin/admin/admin_views/section/1/delete/')
-         # test response contains link to related Article
+        # test response contains link to related Article
         self.assertContains(response, "admin_views/article/1/")
 
         response = self.client.get('/test_admin/admin/admin_views/article/1/delete/')
diff --git a/tests/forms_tests/tests/test_fields.py b/tests/forms_tests/tests/test_fields.py
index 454a8349d7..e57a4b5fd9 100644
--- a/tests/forms_tests/tests/test_fields.py
+++ b/tests/forms_tests/tests/test_fields.py
@@ -1161,7 +1161,7 @@ class FieldsTests(SimpleTestCase):
             "'Select a valid choice. 3 is not one of the available choices.'",
             f.clean, ['3'])
 
-   # ComboField ##################################################################
+    # ComboField ##################################################################
 
     def test_combofield_1(self):
         f = ComboField(fields=[CharField(max_length=20), EmailField()])
diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py
index 8a9b69b879..04d9f0fc9e 100644
--- a/tests/lookup/tests.py
+++ b/tests/lookup/tests.py
@@ -436,7 +436,7 @@ class LookupTests(TestCase):
             ])
 
     def test_none(self):
-       # none() returns a QuerySet that behaves like any other QuerySet object
+        # none() returns a QuerySet that behaves like any other QuerySet object
         self.assertQuerysetEqual(Article.objects.none(), [])
         self.assertQuerysetEqual(
             Article.objects.none().filter(headline__startswith='Article'), [])
diff --git a/tests/mail/tests.py b/tests/mail/tests.py
index 5912d94efb..06292b3cb6 100644
--- a/tests/mail/tests.py
+++ b/tests/mail/tests.py
@@ -192,7 +192,7 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
         SafeMIMEMultipart as well
         """
         headers = {"Date": "Fri, 09 Nov 2001 01:08:47 -0000", "Message-ID": "foo"}
-        subject, from_email, to = 'hello', 'from@example.com', '"Sürname, Firstname" <to@example.com>'
+        from_email, to = 'from@example.com', '"Sürname, Firstname" <to@example.com>'
         text_content = 'This is an important message.'
         html_content = '<p>This is an <strong>important</strong> message.</p>'
         msg = EmailMultiAlternatives('Message from Firstname Sürname', text_content, from_email, [to], headers=headers)
diff --git a/tests/save_delete_hooks/models.py b/tests/save_delete_hooks/models.py
index a6e1abfb77..abba693778 100644
--- a/tests/save_delete_hooks/models.py
+++ b/tests/save_delete_hooks/models.py
@@ -24,7 +24,7 @@ class Person(models.Model):
 
     def save(self, *args, **kwargs):
         self.data.append("Before save")
-         # Call the "real" save() method
+        # Call the "real" save() method
         super(Person, self).save(*args, **kwargs)
         self.data.append("After save")
 
diff --git a/tests/str/tests.py b/tests/str/tests.py
index aeb2874195..4139fa4354 100644
--- a/tests/str/tests.py
+++ b/tests/str/tests.py
@@ -1,4 +1,4 @@
- # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 import datetime
diff --git a/tests/template_tests/test_response.py b/tests/template_tests/test_response.py
index 17d8f11ba5..48a7b89029 100644
--- a/tests/template_tests/test_response.py
+++ b/tests/template_tests/test_response.py
@@ -259,7 +259,8 @@ class TemplateResponseTest(TestCase):
             'first/test.html', {
                 'value': 123,
                 'fn': datetime.now,
-            })
+            }
+        )
         self.assertRaises(ContentNotRenderedError,
                           pickle.dumps, response)