Fixed flake8 E241

11 files changed, 148 insertions, 139 deletions

diff --git a/tests/extra_regress/tests.py b/tests/extra_regress/tests.py
index 26bf915b5a..3b40361750 100644
--- a/tests/extra_regress/tests.py
+++ b/tests/extra_regress/tests.py
@@ -74,7 +74,7 @@ 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=OrderedDict((("alpha", "%s"), ("beta", "2"), ("gamma", "%s"))),
             select_params=(1, 3)
         )
         qs = qs.extra(select={"beta": 4})
diff --git a/tests/file_uploads/tests.py b/tests/file_uploads/tests.py
index 0f1750aeed..72f9d7a77c 100644
--- a/tests/file_uploads/tests.py
+++ b/tests/file_uploads/tests.py
@@ -26,6 +26,7 @@ UNICODE_FILENAME = 'test-0123456789_中文_Orléans.jpg'
 MEDIA_ROOT = sys_tempfile.mkdtemp()
 UPLOAD_TO = os.path.join(MEDIA_ROOT, 'test_upload')
 
+
 @override_settings(MEDIA_ROOT=MEDIA_ROOT)
 class FileUploadTests(TestCase):
     @classmethod
@@ -85,10 +86,10 @@ class FileUploadTests(TestCase):
         payload.write('--' + client.BOUNDARY + '--\r\n')
         r = {
             'CONTENT_LENGTH': len(payload),
-            'CONTENT_TYPE':   client.MULTIPART_CONTENT,
-            'PATH_INFO':      "/file_uploads/echo_content/",
+            'CONTENT_TYPE': client.MULTIPART_CONTENT,
+            'PATH_INFO': "/file_uploads/echo_content/",
             'REQUEST_METHOD': 'POST',
-            'wsgi.input':     payload,
+            'wsgi.input': payload,
         }
         response = self.client.request(**r)
         received = json.loads(response.content.decode('utf-8'))
@@ -152,10 +153,10 @@ class FileUploadTests(TestCase):
 
         r = {
             'CONTENT_LENGTH': len(payload),
-            'CONTENT_TYPE':   client.MULTIPART_CONTENT,
-            'PATH_INFO':      "/file_uploads/echo/",
+            'CONTENT_TYPE': client.MULTIPART_CONTENT,
+            'PATH_INFO': "/file_uploads/echo/",
             'REQUEST_METHOD': 'POST',
-            'wsgi.input':     payload,
+            'wsgi.input': payload,
         }
         response = self.client.request(**r)
 
@@ -189,10 +190,10 @@ class FileUploadTests(TestCase):
         payload.write('\r\n--' + client.BOUNDARY + '--\r\n')
         r = {
             'CONTENT_LENGTH': len(payload),
-            'CONTENT_TYPE':   client.MULTIPART_CONTENT,
-            'PATH_INFO':      "/file_uploads/echo/",
+            'CONTENT_TYPE': client.MULTIPART_CONTENT,
+            'PATH_INFO': "/file_uploads/echo/",
             'REQUEST_METHOD': 'POST',
-            'wsgi.input':     payload,
+            'wsgi.input': payload,
         }
         result = json.loads(self.client.request(**r).content.decode('utf-8'))
         for name, _, expected in cases:
@@ -444,6 +445,6 @@ class MultiParserTests(unittest.TestCase):
         # We're not actually parsing here; just checking if the parser properly
         # instantiates with empty upload handlers.
         MultiPartParser({
-            'CONTENT_TYPE':     'multipart/form-data; boundary=_foo',
-            'CONTENT_LENGTH':   '1'
+            'CONTENT_TYPE': 'multipart/form-data; boundary=_foo',
+            'CONTENT_LENGTH': '1'
         }, StringIO('x'), [], 'utf-8')
diff --git a/tests/file_uploads/urls.py b/tests/file_uploads/urls.py
index 4782a0dab9..a6f446bf55 100644
--- a/tests/file_uploads/urls.py
+++ b/tests/file_uploads/urls.py
@@ -4,15 +4,15 @@ from . import views
 
 
 urlpatterns = patterns('',
-    (r'^upload/$',          views.file_upload_view),
-    (r'^verify/$',          views.file_upload_view_verify),
-    (r'^unicode_name/$',    views.file_upload_unicode_name),
-    (r'^echo/$',            views.file_upload_echo),
+    (r'^upload/$', views.file_upload_view),
+    (r'^verify/$', views.file_upload_view_verify),
+    (r'^unicode_name/$', views.file_upload_unicode_name),
+    (r'^echo/$', views.file_upload_echo),
     (r'^echo_content_type_extra/$', views.file_upload_content_type_extra),
-    (r'^echo_content/$',    views.file_upload_echo_content),
-    (r'^quota/$',           views.file_upload_quota),
-    (r'^quota/broken/$',    views.file_upload_quota_broken),
-    (r'^getlist_count/$',   views.file_upload_getlist_count),
-    (r'^upload_errors/$',   views.file_upload_errors),
-    (r'^filename_case/$',   views.file_upload_filename_case_view),
+    (r'^echo_content/$', views.file_upload_echo_content),
+    (r'^quota/$', views.file_upload_quota),
+    (r'^quota/broken/$', views.file_upload_quota_broken),
+    (r'^getlist_count/$', views.file_upload_getlist_count),
+    (r'^upload_errors/$', views.file_upload_errors),
+    (r'^filename_case/$', views.file_upload_filename_case_view),
 )
diff --git a/tests/generic_views/urls.py b/tests/generic_views/urls.py
index 4ef8f7a97f..20cb6a8e48 100644
--- a/tests/generic_views/urls.py
+++ b/tests/generic_views/urls.py
@@ -260,5 +260,5 @@ urlpatterns = patterns('',
         views.BookSigningDetail.as_view()),
 
     # Useful for testing redirects
-    (r'^accounts/login/$',  'django.contrib.auth.views.login')
+    (r'^accounts/login/$', 'django.contrib.auth.views.login')
 )
diff --git a/tests/generic_views/views.py b/tests/generic_views/views.py
index 2fe44c1b9d..fd88debc0f 100644
--- a/tests/generic_views/views.py
+++ b/tests/generic_views/views.py
@@ -43,7 +43,7 @@ class DictList(generic.ListView):
     """A ListView that doesn't use a model."""
     queryset = [
         {'first': 'John', 'last': 'Lennon'},
-        {'first': 'Yoko',  'last': 'Ono'}
+        {'first': 'Yoko', 'last': 'Ono'}
     ]
     template_name = 'generic_views/list.html'
 
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index 3101418d58..e8b3ac7b7d 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -23,7 +23,7 @@ from django.utils.safestring import mark_safe, SafeBytes, SafeString, SafeText
 from django.utils import six
 from django.utils.six import PY3
 from django.utils.translation import (activate, deactivate,
-    get_language,  get_language_from_request, get_language_info,
+    get_language, get_language_from_request, get_language_info,
     to_locale, trans_real,
     gettext_lazy,
     ugettext, ugettext_lazy,
diff --git a/tests/middleware_exceptions/tests.py b/tests/middleware_exceptions/tests.py
index e0f3729e9b..02e53a00e8 100644
--- a/tests/middleware_exceptions/tests.py
+++ b/tests/middleware_exceptions/tests.py
@@ -8,11 +8,12 @@ from django.template import Template
 from django.test import TestCase
 from django.test.utils import override_settings
 
+
 class TestException(Exception):
     pass
 
-# A middleware base class that tracks which methods have been called
 
+# A middleware base class that tracks which methods have been called
 class TestMiddleware(object):
     def __init__(self):
         self.process_request_called = False
@@ -38,28 +39,32 @@ class TestMiddleware(object):
     def process_exception(self, request, exception):
         self.process_exception_called = True
 
-# Middleware examples that do the right thing
 
+# Middleware examples that do the right thing
 class RequestMiddleware(TestMiddleware):
     def process_request(self, request):
         super(RequestMiddleware, self).process_request(request)
         return HttpResponse('Request Middleware')
 
+
 class ViewMiddleware(TestMiddleware):
     def process_view(self, request, view_func, view_args, view_kwargs):
         super(ViewMiddleware, self).process_view(request, view_func, view_args, view_kwargs)
         return HttpResponse('View Middleware')
 
+
 class ResponseMiddleware(TestMiddleware):
     def process_response(self, request, response):
         super(ResponseMiddleware, self).process_response(request, response)
         return HttpResponse('Response Middleware')
 
+
 class TemplateResponseMiddleware(TestMiddleware):
     def process_template_response(self, request, response):
         super(TemplateResponseMiddleware, self).process_template_response(request, response)
         return TemplateResponse(request, Template('Template Response Middleware'))
 
+
 class ExceptionMiddleware(TestMiddleware):
     def process_exception(self, request, exception):
         super(ExceptionMiddleware, self).process_exception(request, exception)
@@ -67,27 +72,30 @@ class ExceptionMiddleware(TestMiddleware):
 
 
 # Sample middlewares that raise exceptions
-
 class BadRequestMiddleware(TestMiddleware):
     def process_request(self, request):
         super(BadRequestMiddleware, self).process_request(request)
         raise TestException('Test Request Exception')
 
+
 class BadViewMiddleware(TestMiddleware):
     def process_view(self, request, view_func, view_args, view_kwargs):
         super(BadViewMiddleware, self).process_view(request, view_func, view_args, view_kwargs)
         raise TestException('Test View Exception')
 
+
 class BadTemplateResponseMiddleware(TestMiddleware):
     def process_template_response(self, request, response):
         super(BadTemplateResponseMiddleware, self).process_template_response(request, response)
         raise TestException('Test Template Response Exception')
 
+
 class BadResponseMiddleware(TestMiddleware):
     def process_response(self, request, response):
         super(BadResponseMiddleware, self).process_response(request, response)
         raise TestException('Test Response Exception')
 
+
 class BadExceptionMiddleware(TestMiddleware):
     def process_exception(self, request, exception):
         super(BadExceptionMiddleware, self).process_exception(request, exception)
@@ -153,8 +161,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/view/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(middleware,      True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_middleware(self):
@@ -167,8 +175,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/view/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(middleware,      True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_response_middleware(self):
@@ -181,8 +189,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/view/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(middleware,      True, True, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, True, False, True, False)
 
     def test_process_template_response_middleware(self):
@@ -195,8 +203,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/template_response/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, True, True, False)
-        self.assert_middleware_usage(middleware,      True, True, True, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, True, True, False)
+        self.assert_middleware_usage(middleware, True, True, True, True, False)
         self.assert_middleware_usage(post_middleware, True, True, True, True, False)
 
     def test_process_exception_middleware(self):
@@ -209,8 +217,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/view/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(middleware,      True, True, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, True, False, True, False)
 
     def test_process_request_middleware_not_found(self):
@@ -223,8 +231,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/not_found/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(middleware,      True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_middleware_not_found(self):
@@ -237,8 +245,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/not_found/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(middleware,      True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_template_response_middleware_not_found(self):
@@ -251,8 +259,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/not_found/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, True)
-        self.assert_middleware_usage(middleware,      True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, True)
+        self.assert_middleware_usage(middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_response_middleware_not_found(self):
@@ -265,8 +273,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/not_found/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, True)
-        self.assert_middleware_usage(middleware,      True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, True)
+        self.assert_middleware_usage(middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_exception_middleware_not_found(self):
@@ -279,8 +287,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/not_found/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(middleware,      True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_request_middleware_exception(self):
@@ -293,8 +301,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/error/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(middleware,      True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_middleware_exception(self):
@@ -307,8 +315,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/error/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(middleware,      True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_response_middleware_exception(self):
@@ -321,8 +329,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/error/', ['Error in view'], Exception())
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, True)
-        self.assert_middleware_usage(middleware,      True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, True)
+        self.assert_middleware_usage(middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_exception_middleware_exception(self):
@@ -335,8 +343,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/error/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(middleware,      True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_request_middleware_null_view(self):
@@ -349,8 +357,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(middleware,      True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_middleware_null_view(self):
@@ -363,8 +371,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(middleware,      True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_response_middleware_null_view(self):
@@ -380,8 +388,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
             ValueError())
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(middleware,      True, True, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, True, False, True, False)
 
     def test_process_exception_middleware_null_view(self):
@@ -397,8 +405,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
             ValueError())
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(middleware,      True, True, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, True, False, True, False)
 
     def test_process_request_middleware_permission_denied(self):
@@ -411,8 +419,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/permission_denied/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(middleware,      True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_middleware_permission_denied(self):
@@ -425,8 +433,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/permission_denied/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(middleware,      True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_response_middleware_permission_denied(self):
@@ -439,8 +447,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/permission_denied/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, True)
-        self.assert_middleware_usage(middleware,      True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, True)
+        self.assert_middleware_usage(middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_exception_middleware_permission_denied(self):
@@ -453,8 +461,8 @@ class MiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/permission_denied/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(middleware,      True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_template_response_error(self):
@@ -478,8 +486,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/view/', ['Test Request Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_bad_middleware(self):
@@ -492,8 +500,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/view/', ['Test View Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_template_response_bad_middleware(self):
@@ -506,9 +514,9 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/template_response/', ['Test Template Response Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True, True,  True, False)
-        self.assert_middleware_usage(post_middleware, True, True, True,  True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, True, True, False)
+        self.assert_middleware_usage(post_middleware, True, True, True, True, False)
 
     def test_process_response_bad_middleware(self):
         pre_middleware = TestMiddleware()
@@ -520,9 +528,9 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/view/', ['Test Response Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, False, False)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True,  False)
-        self.assert_middleware_usage(post_middleware, True, True, False, True,  False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, False, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(post_middleware, True, True, False, True, False)
 
     def test_process_exception_bad_middleware(self):
         pre_middleware = TestMiddleware()
@@ -534,8 +542,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/view/', [])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, True, False, True, False)
 
     def test_process_request_bad_middleware_not_found(self):
@@ -548,8 +556,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/not_found/', ['Test Request Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_bad_middleware_not_found(self):
@@ -562,8 +570,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/not_found/', ['Test View Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_response_bad_middleware_not_found(self):
@@ -576,9 +584,9 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/not_found/', ['Test Response Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, False, True)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True,  True)
-        self.assert_middleware_usage(post_middleware, True, True, False, True,  True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, False, True)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, True)
+        self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_exception_bad_middleware_not_found(self):
         pre_middleware = TestMiddleware()
@@ -590,8 +598,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/not_found/', ['Test Exception Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_request_bad_middleware_exception(self):
@@ -604,8 +612,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/error/', ['Test Request Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_bad_middleware_exception(self):
@@ -618,8 +626,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/error/', ['Test View Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_response_bad_middleware_exception(self):
@@ -632,9 +640,9 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/error/', ['Error in view', 'Test Response Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, False, True)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True,  True)
-        self.assert_middleware_usage(post_middleware, True, True, False, True,  True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, False, True)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, True)
+        self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_exception_bad_middleware_exception(self):
         pre_middleware = TestMiddleware()
@@ -646,8 +654,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/error/', ['Test Exception Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_request_bad_middleware_null_view(self):
@@ -660,8 +668,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', ['Test Request Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_bad_middleware_null_view(self):
@@ -674,8 +682,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/null_view/', ['Test View Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_response_bad_middleware_null_view(self):
@@ -691,9 +699,9 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         ])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, False, False)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True,  False)
-        self.assert_middleware_usage(post_middleware, True, True, False, True,  False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, False, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(post_middleware, True, True, False, True, False)
 
     def test_process_exception_bad_middleware_null_view(self):
         pre_middleware = TestMiddleware()
@@ -708,8 +716,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
             ValueError())
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, True, False, True, False)
 
     def test_process_request_bad_middleware_permission_denied(self):
@@ -722,8 +730,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/permission_denied/', ['Test Request Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True,  False, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True,  False, False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, False, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, False, False, True, False)
         self.assert_middleware_usage(post_middleware, False, False, False, True, False)
 
     def test_process_view_bad_middleware_permission_denied(self):
@@ -736,8 +744,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/permission_denied/', ['Test View Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True,  False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True,  False, True, False)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, False)
         self.assert_middleware_usage(post_middleware, True, False, False, True, False)
 
     def test_process_response_bad_middleware_permission_denied(self):
@@ -750,9 +758,9 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/permission_denied/', ['Test Response Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, False, True)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True,  True)
-        self.assert_middleware_usage(post_middleware, True, True, False, True,  True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, False, True)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, True)
+        self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
     def test_process_exception_bad_middleware_permission_denied(self):
         pre_middleware = TestMiddleware()
@@ -764,8 +772,8 @@ class BadMiddlewareTests(BaseMiddlewareExceptionTest):
         self.assert_exceptions_handled('/middleware_exceptions/permission_denied/', ['Test Exception Exception'])
 
         # Check that the right middleware methods have been invoked
-        self.assert_middleware_usage(pre_middleware,  True, True, False, True, False)
-        self.assert_middleware_usage(bad_middleware,  True, True, False, True, True)
+        self.assert_middleware_usage(pre_middleware, True, True, False, True, False)
+        self.assert_middleware_usage(bad_middleware, True, True, False, True, True)
         self.assert_middleware_usage(post_middleware, True, True, False, True, True)
 
 
diff --git a/tests/select_related_onetoone/tests.py b/tests/select_related_onetoone/tests.py
index ea9777d1f7..92896b48a2 100644
--- a/tests/select_related_onetoone/tests.py
+++ b/tests/select_related_onetoone/tests.py
@@ -177,15 +177,15 @@ class ReverseSelectRelatedTestCase(TestCase):
         c = Child4.objects.create(name1='n1', name2='n2', value=1, value4=4)
         with self.assertNumQueries(1):
             p = Parent2.objects.select_related('child1').only(
-                'id2',  'child1__value').get(name2="n2")
+                'id2', 'child1__value').get(name2="n2")
             self.assertEqual(p.id2, c.id2)
             self.assertEqual(p.child1.value, 1)
         p = Parent2.objects.select_related('child1').only(
-            'id2',  'child1__value').get(name2="n2")
+            'id2', 'child1__value').get(name2="n2")
         with self.assertNumQueries(1):
             self.assertEqual(p.name2, 'n2')
         p = Parent2.objects.select_related('child1').only(
-            'id2',  'child1__value').get(name2="n2")
+            'id2', 'child1__value').get(name2="n2")
         with self.assertNumQueries(1):
             self.assertEqual(p.child1.name2, 'n2')
 
@@ -193,7 +193,7 @@ class ReverseSelectRelatedTestCase(TestCase):
     def test_inheritance_deferred2(self):
         c = Child4.objects.create(name1='n1', name2='n2', value=1, value4=4)
         qs = Parent2.objects.select_related('child1', 'child4').only(
-            'id2',  'child1__value', 'child1__child4__value4')
+            'id2', 'child1__value', 'child1__child4__value4')
         with self.assertNumQueries(1):
             p = qs.get(name2="n2")
             self.assertEqual(p.id2, c.id2)
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index c617bc07d4..a39f952e4c 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -677,7 +677,7 @@ class TemplateTests(TransRealMixin, TestCase):
             'basic-syntax06': ("{{ multi word variable }}", {}, template.TemplateSyntaxError),
 
             # Raise TemplateSyntaxError for empty variable tags
-            'basic-syntax07': ("{{ }}",        {}, template.TemplateSyntaxError),
+            'basic-syntax07': ("{{ }}", {}, template.TemplateSyntaxError),
             'basic-syntax08': ("{{        }}", {}, template.TemplateSyntaxError),
 
             # Attribute syntax allows a template to call an object's attribute
@@ -1685,11 +1685,11 @@ class TemplateTests(TransRealMixin, TestCase):
             'now01': ('{% now "j n Y" %}', {}, "%d %d %d" % (
                 datetime.now().day, datetime.now().month, datetime.now().year)),
             # Check parsing of locale strings
-            'now02': ('{% now "DATE_FORMAT" %}', {},  date_format(datetime.now())),
+            'now02': ('{% now "DATE_FORMAT" %}', {}, date_format(datetime.now())),
             # Also accept simple quotes - #15092
             'now03': ("{% now 'j n Y' %}", {}, "%d %d %d" % (
                 datetime.now().day, datetime.now().month, datetime.now().year)),
-            'now04': ("{% now 'DATE_FORMAT' %}", {},  date_format(datetime.now())),
+            'now04': ("{% now 'DATE_FORMAT' %}", {}, date_format(datetime.now())),
             'now05': ('''{% now 'j "n" Y'%}''', {}, '''%d "%d" %d''' % (
                 datetime.now().day, datetime.now().month, datetime.now().year)),
             'now06': ('''{% now "j 'n' Y"%}''', {}, '''%d '%d' %d''' % (
diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py
index f5f75c5284..0875f79289 100644
--- a/tests/timezones/tests.py
+++ b/tests/timezones/tests.py
@@ -750,8 +750,8 @@ class TemplateTests(TestCase):
         templates = {
             'notag': Template("{% load tz %}{{ dt }}|{{ dt|localtime }}|{{ dt|utc }}|{{ dt|timezone:ICT }}"),
             'noarg': Template("{% load tz %}{% localtime %}{{ dt }}|{{ dt|localtime }}|{{ dt|utc }}|{{ dt|timezone:ICT }}{% endlocaltime %}"),
-            'on':    Template("{% load tz %}{% localtime on %}{{ dt }}|{{ dt|localtime }}|{{ dt|utc }}|{{ dt|timezone:ICT }}{% endlocaltime %}"),
-            'off':   Template("{% load tz %}{% localtime off %}{{ dt }}|{{ dt|localtime }}|{{ dt|utc }}|{{ dt|timezone:ICT }}{% endlocaltime %}"),
+            'on': Template("{% load tz %}{% localtime on %}{{ dt }}|{{ dt|localtime }}|{{ dt|utc }}|{{ dt|timezone:ICT }}{% endlocaltime %}"),
+            'off': Template("{% load tz %}{% localtime off %}{{ dt }}|{{ dt|localtime }}|{{ dt|utc }}|{{ dt|timezone:ICT }}{% endlocaltime %}"),
         }
 
         # Transform a list of keys in 'datetimes' to the expected template
@@ -765,26 +765,26 @@ class TemplateTests(TestCase):
             'utc': {
                 'notag': t('eat', 'eat', 'utc', 'ict'),
                 'noarg': t('eat', 'eat', 'utc', 'ict'),
-                'on':    t('eat', 'eat', 'utc', 'ict'),
-                'off':   t('utc', 'eat', 'utc', 'ict'),
+                'on': t('eat', 'eat', 'utc', 'ict'),
+                'off': t('utc', 'eat', 'utc', 'ict'),
             },
             'eat': {
                 'notag': t('eat', 'eat', 'utc', 'ict'),
                 'noarg': t('eat', 'eat', 'utc', 'ict'),
-                'on':    t('eat', 'eat', 'utc', 'ict'),
-                'off':   t('eat', 'eat', 'utc', 'ict'),
+                'on': t('eat', 'eat', 'utc', 'ict'),
+                'off': t('eat', 'eat', 'utc', 'ict'),
             },
             'ict': {
                 'notag': t('eat', 'eat', 'utc', 'ict'),
                 'noarg': t('eat', 'eat', 'utc', 'ict'),
-                'on':    t('eat', 'eat', 'utc', 'ict'),
-                'off':   t('ict', 'eat', 'utc', 'ict'),
+                'on': t('eat', 'eat', 'utc', 'ict'),
+                'off': t('ict', 'eat', 'utc', 'ict'),
             },
             'naive': {
                 'notag': t('naive', 'eat', 'utc', 'ict'),
                 'noarg': t('naive', 'eat', 'utc', 'ict'),
-                'on':    t('naive', 'eat', 'utc', 'ict'),
-                'off':   t('naive', 'eat', 'utc', 'ict'),
+                'on': t('naive', 'eat', 'utc', 'ict'),
+                'off': t('naive', 'eat', 'utc', 'ict'),
             }
         }
 
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index 9572a5bc26..4134057b23 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -397,8 +397,8 @@ class NamespaceTests(TestCase):
         self.assertEqual('/ns-outer/42/normal/', reverse('inc-outer:inc-normal-view', args=[42]))
         self.assertEqual('/ns-outer/42/normal/37/4/', reverse('inc-outer:inc-normal-view', kwargs={'outer': 42, 'arg1': 37, 'arg2': 4}))
         self.assertEqual('/ns-outer/42/normal/37/4/', reverse('inc-outer:inc-normal-view', args=[42, 37, 4]))
-        self.assertEqual('/ns-outer/42/+%5C$*/', reverse('inc-outer:inc-special-view',  kwargs={'outer': 42}))
-        self.assertEqual('/ns-outer/42/+%5C$*/', reverse('inc-outer:inc-special-view',  args=[42]))
+        self.assertEqual('/ns-outer/42/+%5C$*/', reverse('inc-outer:inc-special-view', kwargs={'outer': 42}))
+        self.assertEqual('/ns-outer/42/+%5C$*/', reverse('inc-outer:inc-special-view', args=[42]))
 
     def test_multiple_namespace_pattern(self):
         "Namespaces can be embedded"