Fixed assorted flake8 errors.

12 files changed, 37 insertions, 35 deletions

diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py
index f9ef079904..54a4993171 100644
--- a/tests/admin_changelist/tests.py
+++ b/tests/admin_changelist/tests.py
@@ -505,7 +505,7 @@ class ChangeListTests(TestCase):
             admin.site.register(UnorderedObject, UnorderedObjectAdmin)
             model_admin = UnorderedObjectAdmin(UnorderedObject, admin.site)
             counter = 0 if ascending else 51
-            for page in range (0, 5):
+            for page in range(0, 5):
                 request = self._mocked_authenticated_request('/unorderedobject/?p=%s' % page, superuser)
                 response = model_admin.changelist_view(request)
                 for result in response.context_data['cl'].result_list:
@@ -550,7 +550,7 @@ class ChangeListTests(TestCase):
             admin.site.register(OrderedObject, OrderedObjectAdmin)
             model_admin = OrderedObjectAdmin(OrderedObject, admin.site)
             counter = 0 if ascending else 51
-            for page in range (0, 5):
+            for page in range(0, 5):
                 request = self._mocked_authenticated_request('/orderedobject/?p=%s' % page, superuser)
                 response = model_admin.changelist_view(request)
                 for result in response.context_data['cl'].result_list:
@@ -588,7 +588,7 @@ class ChangeListTests(TestCase):
         user_parents = self._create_superuser('parents')
 
         # Test with user 'noparents'
-        m =  DynamicListFilterChildAdmin(Child, admin.site)
+        m = DynamicListFilterChildAdmin(Child, admin.site)
         request = self._mocked_authenticated_request('/child/', user_noparents)
         response = m.changelist_view(request)
         self.assertEqual(response.context_data['cl'].list_filter, ['name', 'age'])
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
index 871852425a..6dfef9695a 100644
--- a/tests/admin_inlines/tests.py
+++ b/tests/admin_inlines/tests.py
@@ -170,7 +170,7 @@ class TestInline(TestCase):
         holder = Holder.objects.create(pk=123456789, dummy=42)
         inner = Inner.objects.create(pk=987654321, holder=holder, dummy=42, readonly='')
         response = self.client.get('/admin/admin_inlines/holder/%i/' % holder.id)
-        inner_shortcut = 'r/%s/%s/'%(ContentType.objects.get_for_model(inner).pk, inner.pk)
+        inner_shortcut = 'r/%s/%s/' % (ContentType.objects.get_for_model(inner).pk, inner.pk)
         self.assertContains(response, inner_shortcut)
 
     def test_custom_pk_shortcut(self):
@@ -182,8 +182,8 @@ class TestInline(TestCase):
         child1 = ChildModel1.objects.create(my_own_pk="bar", name="Bar", parent=parent)
         child2 = ChildModel2.objects.create(my_own_pk="baz", name="Baz", parent=parent)
         response = self.client.get('/admin/admin_inlines/parentmodelwithcustompk/foo/')
-        child1_shortcut = 'r/%s/%s/'%(ContentType.objects.get_for_model(child1).pk, child1.pk)
-        child2_shortcut = 'r/%s/%s/'%(ContentType.objects.get_for_model(child2).pk, child2.pk)
+        child1_shortcut = 'r/%s/%s/' % (ContentType.objects.get_for_model(child1).pk, child1.pk)
+        child2_shortcut = 'r/%s/%s/' % (ContentType.objects.get_for_model(child2).pk, child2.pk)
         self.assertContains(response, child1_shortcut)
         self.assertContains(response, child2_shortcut)
 
diff --git a/tests/admin_widgets/urls.py b/tests/admin_widgets/urls.py
index 3da5d25bc8..94c841765f 100644
--- a/tests/admin_widgets/urls.py
+++ b/tests/admin_widgets/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, include
 
-from . import  widgetadmin
+from . import widgetadmin
 
 
 urlpatterns = patterns('',
diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py
index 9fcaefe6f5..111ef79b5e 100644
--- a/tests/aggregation_regress/tests.py
+++ b/tests/aggregation_regress/tests.py
@@ -1017,20 +1017,20 @@ class AggregationTests(TestCase):
 
         tests aggregations with generic reverse relations
         """
-        b = Book.objects.get(name='Practical Django Projects')
-        ItemTag.objects.create(object_id=b.id, tag='intermediate',
-                content_type=ContentType.objects.get_for_model(b))
-        ItemTag.objects.create(object_id=b.id, tag='django',
-                content_type=ContentType.objects.get_for_model(b))
+        django_book = Book.objects.get(name='Practical Django Projects')
+        ItemTag.objects.create(object_id=django_book.id, tag='intermediate',
+                content_type=ContentType.objects.get_for_model(django_book))
+        ItemTag.objects.create(object_id=django_book.id, tag='django',
+                content_type=ContentType.objects.get_for_model(django_book))
         # Assign a tag to model with same PK as the book above. If the JOIN
         # used in aggregation doesn't have content type as part of the
         # condition the annotation will also count the 'hi mom' tag for b.
-        wmpk = WithManualPK.objects.create(id=b.pk)
+        wmpk = WithManualPK.objects.create(id=django_book.pk)
         ItemTag.objects.create(object_id=wmpk.id, tag='hi mom',
                 content_type=ContentType.objects.get_for_model(wmpk))
-        b = Book.objects.get(name__startswith='Paradigms of Artificial Intelligence')
-        ItemTag.objects.create(object_id=b.id, tag='intermediate',
-                content_type=ContentType.objects.get_for_model(b))
+        ai_book = Book.objects.get(name__startswith='Paradigms of Artificial Intelligence')
+        ItemTag.objects.create(object_id=ai_book.id, tag='intermediate',
+                content_type=ContentType.objects.get_for_model(ai_book))
 
         self.assertEqual(Book.objects.aggregate(Count('tags')), {'tags__count': 3})
         results = Book.objects.annotate(Count('tags')).order_by('-tags__count', 'name')
diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index d46c61df67..6912e8f755 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -149,7 +149,7 @@ class DummyCacheTests(unittest.TestCase):
             'ascii': 'ascii_value',
             'unicode_ascii': 'Iñtërnâtiônàlizætiøn1',
             'Iñtërnâtiônàlizætiøn': 'Iñtërnâtiônàlizætiøn2',
-            'ascii2': {'x' : 1 }
+            'ascii2': {'x' : 1}
             }
         for (key, value) in stuff.items():
             self.cache.set(key, value)
@@ -434,7 +434,7 @@ class BaseCacheTests(object):
         it is an absolute expiration timestamp instead of a relative
         offset. Test that we honour this convention. Refs #12399.
         '''
-        self.cache.set('key1', 'eggs', 60*60*24*30 + 1) #30 days + 1 second
+        self.cache.set('key1', 'eggs', 60*60*24*30 + 1)  # 30 days + 1 second
         self.assertEqual(self.cache.get('key1'), 'eggs')
 
         self.cache.add('key2', 'ham', 60*60*24*30 + 1)
@@ -1432,7 +1432,7 @@ class CacheI18nTest(TestCase):
         self.assertEqual(key, key2)
 
     @override_settings(USE_I18N=False, USE_L10N=False)
-    def test_cache_key_no_i18n (self):
+    def test_cache_key_no_i18n(self):
         request = self._get_request()
         lang = translation.get_language()
         tz = force_text(timezone.get_current_timezone_name(), errors='ignore')
diff --git a/tests/expressions_regress/tests.py b/tests/expressions_regress/tests.py
index eb807cb050..a637d88e68 100644
--- a/tests/expressions_regress/tests.py
+++ b/tests/expressions_regress/tests.py
@@ -367,7 +367,7 @@ class FTimeDeltaTests(TestCase):
     def test_delta_invalid_op_mod(self):
         raised = False
         try:
-            r = repr(Experiment.objects.filter(end__lt=F('start')%self.deltas[0]))
+            r = repr(Experiment.objects.filter(end__lt=F('start') % self.deltas[0]))
         except TypeError:
             raised = True
         self.assertTrue(raised, "TypeError not raised on attempt to modulo divide datetime by timedelta.")
diff --git a/tests/forms_tests/tests/test_formsets.py b/tests/forms_tests/tests/test_formsets.py
index 4ac910a421..6eadf6028d 100644
--- a/tests/forms_tests/tests/test_formsets.py
+++ b/tests/forms_tests/tests/test_formsets.py
@@ -1071,7 +1071,7 @@ class FormsFormsetTestCase(TestCase):
 
     def test_formset_total_error_count(self):
         """A valid formset should have 0 total errors."""
-        data = [ #  formset_data, expected error count
+        data = [  # formset_data, expected error count
             ([('Calexico', '100')], 0),
             ([('Calexico', '')], 1),
             ([('', 'invalid')], 2),
diff --git a/tests/multiple_database/tests.py b/tests/multiple_database/tests.py
index 37f59061ac..edc4b99f09 100644
--- a/tests/multiple_database/tests.py
+++ b/tests/multiple_database/tests.py
@@ -113,7 +113,7 @@ class QueryTestCase(TestCase):
         dive = Book.objects.using('other').create(title="Dive into Python",
                                                   published=datetime.date(2009, 5, 4))
 
-        dive =  Book.objects.using('other').get(published=datetime.date(2009, 5, 4))
+        dive = Book.objects.using('other').get(published=datetime.date(2009, 5, 4))
         self.assertEqual(dive.title, "Dive into Python")
         self.assertRaises(Book.DoesNotExist, Book.objects.using('default').get, published=datetime.date(2009, 5, 4))
 
@@ -125,7 +125,7 @@ class QueryTestCase(TestCase):
         self.assertEqual(dive.title, "Dive into Python")
         self.assertRaises(Book.DoesNotExist, Book.objects.using('default').get, title__iexact="dive INTO python")
 
-        dive =  Book.objects.using('other').get(published__year=2009)
+        dive = Book.objects.using('other').get(published__year=2009)
         self.assertEqual(dive.title, "Dive into Python")
         self.assertEqual(dive.published, datetime.date(2009, 5, 4))
         self.assertRaises(Book.DoesNotExist, Book.objects.using('default').get, published__year=2009)
diff --git a/tests/or_lookups/tests.py b/tests/or_lookups/tests.py
index 264d999575..add9b81b3c 100644
--- a/tests/or_lookups/tests.py
+++ b/tests/or_lookups/tests.py
@@ -24,7 +24,7 @@ class OrLookupsTests(TestCase):
 
     def test_filter_or(self):
         self.assertQuerysetEqual(
-            Article.objects.filter(headline__startswith='Hello') |  Article.objects.filter(headline__startswith='Goodbye'), [
+            Article.objects.filter(headline__startswith='Hello') | Article.objects.filter(headline__startswith='Goodbye'), [
                 'Hello',
                 'Goodbye',
                 'Hello and goodbye'
diff --git a/tests/prefetch_related/tests.py b/tests/prefetch_related/tests.py
index 9d5a5290da..6e0b617161 100644
--- a/tests/prefetch_related/tests.py
+++ b/tests/prefetch_related/tests.py
@@ -321,9 +321,9 @@ class GenericRelationTests(TestCase):
                          [t.created_by for t in TaggedItem.objects.all()])
 
     def test_generic_relation(self):
-        b = Bookmark.objects.create(url='http://www.djangoproject.com/')
-        t1 = TaggedItem.objects.create(content_object=b, tag='django')
-        t2 = TaggedItem.objects.create(content_object=b, tag='python')
+        bookmark = Bookmark.objects.create(url='http://www.djangoproject.com/')
+        t1 = TaggedItem.objects.create(content_object=bookmark, tag='django')
+        t2 = TaggedItem.objects.create(content_object=bookmark, tag='python')
 
         with self.assertNumQueries(2):
             tags = [t.tag for b in Bookmark.objects.prefetch_related('tags')
@@ -509,8 +509,8 @@ class NullableTest(TestCase):
             co_serfs = [list(e.boss.serfs.all()) if e.boss is not None else []
                         for e in qs]
 
-        qs2 =  Employee.objects.select_related('boss')
-        co_serfs2 =  [list(e.boss.serfs.all()) if e.boss is not None else []
+        qs2 = Employee.objects.select_related('boss')
+        co_serfs2 = [list(e.boss.serfs.all()) if e.boss is not None else []
                         for e in qs2]
 
         self.assertEqual(co_serfs, co_serfs2)
@@ -522,8 +522,8 @@ class NullableTest(TestCase):
             co_serfs = [list(e.boss.serfs.all()) if e.boss is not None else []
                         for e in qs]
 
-        qs2 =  Employee.objects.all()
-        co_serfs2 =  [list(e.boss.serfs.all()) if e.boss is not None else []
+        qs2 = Employee.objects.all()
+        co_serfs2 = [list(e.boss.serfs.all()) if e.boss is not None else []
                         for e in qs2]
 
         self.assertEqual(co_serfs, co_serfs2)
diff --git a/tests/queries/tests.py b/tests/queries/tests.py
index 6930f3093d..32ffc06dbb 100644
--- a/tests/queries/tests.py
+++ b/tests/queries/tests.py
@@ -1558,7 +1558,9 @@ class Queries5Tests(TestCase):
         # extra()
         qs = Ranking.objects.extra(select={'good': 'case when rank > 2 then 1 else 0 end'})
         dicts = qs.values().order_by('id')
-        for d in dicts: del d['id']; del d['author_id']
+        for d in dicts:
+            del d['id']
+            del d['author_id']
         self.assertEqual(
             [sorted(d.items()) for d in dicts],
             [[('good', 0), ('rank', 2)], [('good', 0), ('rank', 1)], [('good', 1), ('rank', 3)]]
@@ -2668,7 +2670,7 @@ class NullJoinPromotionOrTest(TestCase):
         # problem here was that b__name generates a LOUTER JOIN, then
         # b__c__name generates join to c, which the ORM tried to promote but
         # failed as that join isn't nullable.
-        q_obj =  (
+        q_obj = (
             Q(d__name='foo')|
             Q(b__name='foo')|
             Q(b__c__name='foo')
diff --git a/tests/swappable_models/models.py b/tests/swappable_models/models.py
index 92692d4396..c5b4425489 100644
--- a/tests/swappable_models/models.py
+++ b/tests/swappable_models/models.py
@@ -2,7 +2,7 @@ from django.db import models
 
 
 class Article(models.Model):
-    title =  models.CharField(max_length=100)
+    title = models.CharField(max_length=100)
     publication_date = models.DateField()
 
     class Meta:
@@ -10,6 +10,6 @@ class Article(models.Model):
 
 
 class AlternateArticle(models.Model):
-    title =  models.CharField(max_length=100)
+    title = models.CharField(max_length=100)
     publication_date = models.DateField()
     byline = models.CharField(max_length=100)