From e737c009b81df4a0126d61234e1d55f19956a78b Mon Sep 17 00:00:00 2001
From: Boryslav Larin <brabadu@gmail.com>
Date: Sat, 2 Nov 2013 21:37:48 +0200
Subject: [PATCH] Fixed flake8 E241

---
 django/contrib/gis/measure.py                 |   2 +-
 django/contrib/gis/tests/geoapp/test_feeds.py |   4 +-
 django/contrib/gis/tests/relatedapp/tests.py  |   2 +-
 django/contrib/sitemaps/__init__.py           |  13 +-
 django/core/management/commands/loaddata.py   |   6 +-
 django/core/management/validation.py          |   2 +-
 django/forms/extras/widgets.py                |   4 +-
 django/test/client.py                         |  34 +--
 django/test/utils.py                          |   2 +-
 django/utils/jslex.py                         |  82 ++++----
 django/utils/termcolors.py                    |  93 ++++----
 django/utils/translation/__init__.py          |   2 +-
 docs/_ext/djangodocs.py                       |  49 ++---
 setup.cfg                                     |   2 +-
 tests/extra_regress/tests.py                  |   2 +-
 tests/file_uploads/tests.py                   |  23 +-
 tests/file_uploads/urls.py                    |  20 +-
 tests/generic_views/urls.py                   |   2 +-
 tests/generic_views/views.py                  |   2 +-
 tests/i18n/tests.py                           |   2 +-
 tests/middleware_exceptions/tests.py          | 198 +++++++++---------
 tests/select_related_onetoone/tests.py        |   8 +-
 tests/template_tests/tests.py                 |   6 +-
 tests/timezones/tests.py                      |  20 +-
 tests/urlpatterns_reverse/tests.py            |   4 +-
 25 files changed, 303 insertions(+), 281 deletions(-)

diff --git a/django/contrib/gis/measure.py b/django/contrib/gis/measure.py
index 0343211495..b8070c715a 100644
--- a/django/contrib/gis/measure.py
+++ b/django/contrib/gis/measure.py
@@ -234,7 +234,7 @@ class Distance(MeasureBase):
         'british_yd': 0.914398414616,
         'clarke_ft': 0.3047972654,
         'clarke_link': 0.201166195164,
-        'fathom':  1.8288,
+        'fathom': 1.8288,
         'ft': 0.3048,
         'german_m': 1.0000135965,
         'gold_coast_ft': 0.304799710181508,
diff --git a/django/contrib/gis/tests/geoapp/test_feeds.py b/django/contrib/gis/tests/geoapp/test_feeds.py
index fac81614c9..9ae06d76e0 100644
--- a/django/contrib/gis/tests/geoapp/test_feeds.py
+++ b/django/contrib/gis/tests/geoapp/test_feeds.py
@@ -49,7 +49,7 @@ class GeoFeedTest(TestCase):
         # Incrementing through the feeds.
         for feed in [feed1, feed2]:
             # Ensuring the georss namespace was added to the <rss> element.
-            self.assertEqual(feed.getAttribute('xmlns:georss'),  'http://www.georss.org/georss')
+            self.assertEqual(feed.getAttribute('xmlns:georss'), 'http://www.georss.org/georss')
             chan = feed.getElementsByTagName('channel')[0]
             items = chan.getElementsByTagName('item')
             self.assertEqual(len(items), City.objects.count())
@@ -69,7 +69,7 @@ class GeoFeedTest(TestCase):
 
         for feed in [feed1, feed2]:
             # Ensuring the georsss namespace was added to the <feed> element.
-            self.assertEqual(feed.getAttribute('xmlns:georss'),  'http://www.georss.org/georss')
+            self.assertEqual(feed.getAttribute('xmlns:georss'), 'http://www.georss.org/georss')
             entries = feed.getElementsByTagName('entry')
             self.assertEqual(len(entries), City.objects.count())
 
diff --git a/django/contrib/gis/tests/relatedapp/tests.py b/django/contrib/gis/tests/relatedapp/tests.py
index b165699e22..b478005c40 100644
--- a/django/contrib/gis/tests/relatedapp/tests.py
+++ b/django/contrib/gis/tests/relatedapp/tests.py
@@ -27,7 +27,7 @@ class RelatedGeoModelTest(TestCase):
         cities = (
             ('Aurora', 'TX', -97.516111, 33.058333),
             ('Roswell', 'NM', -104.528056, 33.387222),
-            ('Kecksburg', 'PA',  -79.460734, 40.18476),
+            ('Kecksburg', 'PA', -79.460734, 40.18476),
         )
 
         for qs in (qs1, qs2, qs3):
diff --git a/django/contrib/sitemaps/__init__.py b/django/contrib/sitemaps/__init__.py
index 31d2d8c5d9..db31043bfa 100644
--- a/django/contrib/sitemaps/__init__.py
+++ b/django/contrib/sitemaps/__init__.py
@@ -6,9 +6,11 @@ from django.utils.six.moves.urllib.request import urlopen
 
 PING_URL = "http://www.google.com/webmasters/tools/ping"
 
+
 class SitemapNotFound(Exception):
     pass
 
+
 def ping_google(sitemap_url=None, ping_url=PING_URL):
     """
     Alerts Google that the sitemap for the current site has been updated.
@@ -35,6 +37,7 @@ def ping_google(sitemap_url=None, ping_url=PING_URL):
     params = urlencode({'sitemap': url})
     urlopen("%s?%s" % (ping_url, params))
 
+
 class Sitemap(object):
     # This limit is defined by Google. See the index documentation at
     # http://sitemaps.org/protocol.php#index.
@@ -94,22 +97,24 @@ class Sitemap(object):
                     (latest_lastmod is None or lastmod > latest_lastmod)):
                     latest_lastmod = lastmod
             url_info = {
-                'item':       item,
-                'location':   loc,
-                'lastmod':    lastmod,
+                'item': item,
+                'location': loc,
+                'lastmod': lastmod,
                 'changefreq': self.__get('changefreq', item, None),
-                'priority':   str(priority if priority is not None else ''),
+                'priority': str(priority if priority is not None else ''),
             }
             urls.append(url_info)
         if all_items_lastmod and latest_lastmod:
             self.latest_lastmod = latest_lastmod
         return urls
 
+
 class FlatPageSitemap(Sitemap):
     def items(self):
         current_site = Site.objects.get_current()
         return current_site.flatpage_set.filter(registration_required=False)
 
+
 class GenericSitemap(Sitemap):
     priority = None
     changefreq = None
diff --git a/django/core/management/commands/loaddata.py b/django/core/management/commands/loaddata.py
index 9e191b1982..72c5d0854f 100644
--- a/django/core/management/commands/loaddata.py
+++ b/django/core/management/commands/loaddata.py
@@ -72,9 +72,9 @@ class Command(BaseCommand):
 
         self.serialization_formats = serializers.get_public_serializer_formats()
         self.compression_formats = {
-            None:   open,
-            'gz':   gzip.GzipFile,
-            'zip':  SingleZipReader
+            None: open,
+            'gz': gzip.GzipFile,
+            'zip': SingleZipReader
         }
         if has_bz2:
             self.compression_formats['bz2'] = bz2.BZ2File
diff --git a/django/core/management/validation.py b/django/core/management/validation.py
index f0d6cae039..0a976d72a1 100644
--- a/django/core/management/validation.py
+++ b/django/core/management/validation.py
@@ -111,7 +111,7 @@ def get_validation_errors(outfile, app=None):
                 try:
                     max_digits = int(f.max_digits)
                     if max_digits <= 0:
-                        e.add(opts,  mdigits_msg % f.name)
+                        e.add(opts, mdigits_msg % f.name)
                     else:
                         mdigits_ok = True
                 except (ValueError, TypeError):
diff --git a/django/forms/extras/widgets.py b/django/forms/extras/widgets.py
index 5590a9806a..95831679b8 100644
--- a/django/forms/extras/widgets.py
+++ b/django/forms/extras/widgets.py
@@ -19,6 +19,7 @@ __all__ = ('SelectDateWidget',)
 
 RE_DATE = re.compile(r'(\d{4})-(\d\d?)-(\d\d?)$')
 
+
 def _parse_date_fmt():
     fmt = get_format('DATE_FORMAT')
     escaped = False
@@ -39,6 +40,7 @@ def _parse_date_fmt():
             #if not self.first_select: self.first_select = 'day'
     return output
 
+
 class SelectDateWidget(Widget):
     """
     A Widget that splits date input into three <select> boxes.
@@ -90,7 +92,7 @@ class SelectDateWidget(Widget):
         choices = list(six.iteritems(self.months))
         month_html = self.create_select(name, self.month_field, value, month_val, choices)
         choices = [(i, i) for i in range(1, 32)]
-        day_html = self.create_select(name, self.day_field, value, day_val,  choices)
+        day_html = self.create_select(name, self.day_field, value, day_val, choices)
 
         output = []
         for field in _parse_date_fmt():
diff --git a/django/test/client.py b/django/test/client.py
index b6bf01c1cb..c916b7dbe0 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -222,21 +222,21 @@ class RequestFactory(object):
         # - REMOTE_ADDR: often useful, see #8551.
         # See http://www.python.org/dev/peps/pep-3333/#environ-variables
         environ = {
-            'HTTP_COOKIE':       self.cookies.output(header='', sep='; '),
-            'PATH_INFO':         str('/'),
-            'REMOTE_ADDR':       str('127.0.0.1'),
-            'REQUEST_METHOD':    str('GET'),
-            'SCRIPT_NAME':       str(''),
-            'SERVER_NAME':       str('testserver'),
-            'SERVER_PORT':       str('80'),
-            'SERVER_PROTOCOL':   str('HTTP/1.1'),
-            'wsgi.version':      (1, 0),
-            'wsgi.url_scheme':   str('http'),
-            'wsgi.input':        FakePayload(b''),
-            'wsgi.errors':       self.errors,
+            'HTTP_COOKIE': self.cookies.output(header='', sep='; '),
+            'PATH_INFO': str('/'),
+            'REMOTE_ADDR': str('127.0.0.1'),
+            'REQUEST_METHOD': str('GET'),
+            'SCRIPT_NAME': str(''),
+            'SERVER_NAME': str('testserver'),
+            'SERVER_PORT': str('80'),
+            'SERVER_PROTOCOL': str('HTTP/1.1'),
+            'wsgi.version': (1, 0),
+            'wsgi.url_scheme': str('http'),
+            'wsgi.input': FakePayload(b''),
+            'wsgi.errors': self.errors,
             'wsgi.multiprocess': True,
-            'wsgi.multithread':  False,
-            'wsgi.run_once':     False,
+            'wsgi.multithread': False,
+            'wsgi.run_once': False,
         }
         environ.update(self.defaults)
         environ.update(request)
@@ -327,7 +327,7 @@ class RequestFactory(object):
         parsed = urlparse(path)
         data = force_bytes(data, settings.DEFAULT_CHARSET)
         r = {
-            'PATH_INFO':      self._get_path(parsed),
+            'PATH_INFO': self._get_path(parsed),
             'REQUEST_METHOD': str(method),
             'SERVER_PORT': str('443') if secure else str('80'),
             'wsgi.url_scheme': str('https') if secure else str('http'),
@@ -335,8 +335,8 @@ class RequestFactory(object):
         if data:
             r.update({
                 'CONTENT_LENGTH': len(data),
-                'CONTENT_TYPE':   str(content_type),
-                'wsgi.input':     FakePayload(data),
+                'CONTENT_TYPE': str(content_type),
+                'wsgi.input': FakePayload(data),
             })
         r.update(extra)
         # If QUERY_STRING is absent or empty, we want to extract it from the URL.
diff --git a/django/test/utils.py b/django/test/utils.py
index 60c67e1fc6..5e68cfc6b3 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -23,7 +23,7 @@ from django.utils.translation import deactivate
 
 
 __all__ = (
-    'Approximate', 'ContextList',  'get_runner', 'override_settings',
+    'Approximate', 'ContextList', 'get_runner', 'override_settings',
     'requires_tz_support', 'setup_test_environment', 'teardown_test_environment',
 )
 
diff --git a/django/utils/jslex.py b/django/utils/jslex.py
index 5b32deb0b8..8c481fd1d8 100644
--- a/django/utils/jslex.py
+++ b/django/utils/jslex.py
@@ -2,6 +2,7 @@
 # Originally from https://bitbucket.org/ned/jslex
 import re
 
+
 class Tok(object):
     """
     A specification for a token class.
@@ -15,6 +16,7 @@ class Tok(object):
         self.regex = regex
         self.next = next
 
+
 def literals(choices, prefix="", suffix=""):
     """
     Create a regex from a space-separated list of literal `choices`.
@@ -97,49 +99,49 @@ class JsLexer(Lexer):
     # http://inimino.org/~inimino/blog/javascript_semicolons
 
     both_before = [
-        Tok("comment",      r"/\*(.|\n)*?\*/"),
-        Tok("linecomment",  r"//.*?$"),
-        Tok("ws",           r"\s+"),
-        Tok("keyword",      literals("""
-                                break case catch class const continue debugger
-                                default delete do else enum export extends
-                                finally for function if import in instanceof
-                                new return super switch this throw try typeof
-                                var void while with
-                                """, suffix=r"\b"), next='reg'),
-        Tok("reserved",     literals("null true false", suffix=r"\b"), next='div'),
-        Tok("id",           r"""
-                            ([a-zA-Z_$   ]|\\u[0-9a-fA-Z]{4})   # first char
-                            ([a-zA-Z_$0-9]|\\u[0-9a-fA-F]{4})*  # rest chars
-                            """, next='div'),
-        Tok("hnum",         r"0[xX][0-9a-fA-F]+", next='div'),
-        Tok("onum",         r"0[0-7]+"),
-        Tok("dnum",         r"""
-                            (   (0|[1-9][0-9]*)     # DecimalIntegerLiteral
-                                \.                  # dot
-                                [0-9]*              # DecimalDigits-opt
-                                ([eE][-+]?[0-9]+)?  # ExponentPart-opt
-                            |
-                                \.                  # dot
-                                [0-9]+              # DecimalDigits
-                                ([eE][-+]?[0-9]+)?  # ExponentPart-opt
-                            |
-                                (0|[1-9][0-9]*)     # DecimalIntegerLiteral
-                                ([eE][-+]?[0-9]+)?  # ExponentPart-opt
-                            )
-                            """, next='div'),
-        Tok("punct",        literals("""
-                                >>>= === !== >>> <<= >>= <= >= == != << >> &&
-                                || += -= *= %= &= |= ^=
-                                """), next="reg"),
-        Tok("punct",        literals("++ -- ) ]"), next='div'),
-        Tok("punct",        literals("{ } ( [ . ; , < > + - * % & | ^ ! ~ ? : ="), next='reg'),
-        Tok("string",       r'"([^"\\]|(\\(.|\n)))*?"', next='div'),
-        Tok("string",       r"'([^'\\]|(\\(.|\n)))*?'", next='div'),
+        Tok("comment", r"/\*(.|\n)*?\*/"),
+        Tok("linecomment", r"//.*?$"),
+        Tok("ws", r"\s+"),
+        Tok("keyword", literals("""
+                           break case catch class const continue debugger
+                           default delete do else enum export extends
+                           finally for function if import in instanceof
+                           new return super switch this throw try typeof
+                           var void while with
+                           """, suffix=r"\b"), next='reg'),
+        Tok("reserved", literals("null true false", suffix=r"\b"), next='div'),
+        Tok("id", r"""
+                  ([a-zA-Z_$   ]|\\u[0-9a-fA-Z]{4})   # first char
+                  ([a-zA-Z_$0-9]|\\u[0-9a-fA-F]{4})*  # rest chars
+                  """, next='div'),
+        Tok("hnum", r"0[xX][0-9a-fA-F]+", next='div'),
+        Tok("onum", r"0[0-7]+"),
+        Tok("dnum", r"""
+                    (   (0|[1-9][0-9]*)     # DecimalIntegerLiteral
+                        \.                  # dot
+                        [0-9]*              # DecimalDigits-opt
+                        ([eE][-+]?[0-9]+)?  # ExponentPart-opt
+                    |
+                        \.                  # dot
+                        [0-9]+              # DecimalDigits
+                        ([eE][-+]?[0-9]+)?  # ExponentPart-opt
+                    |
+                        (0|[1-9][0-9]*)     # DecimalIntegerLiteral
+                        ([eE][-+]?[0-9]+)?  # ExponentPart-opt
+                    )
+                    """, next='div'),
+        Tok("punct", literals("""
+                         >>>= === !== >>> <<= >>= <= >= == != << >> &&
+                         || += -= *= %= &= |= ^=
+                         """), next="reg"),
+        Tok("punct", literals("++ -- ) ]"), next='div'),
+        Tok("punct", literals("{ } ( [ . ; , < > + - * % & | ^ ! ~ ? : ="), next='reg'),
+        Tok("string", r'"([^"\\]|(\\(.|\n)))*?"', next='div'),
+        Tok("string", r"'([^'\\]|(\\(.|\n)))*?'", next='div'),
     ]
 
     both_after = [
-        Tok("other",        r"."),
+        Tok("other", r"."),
     ]
 
     states = {
diff --git a/django/utils/termcolors.py b/django/utils/termcolors.py
index 2aabf08903..cb2a0f9748 100644
--- a/django/utils/termcolors.py
+++ b/django/utils/termcolors.py
@@ -11,6 +11,7 @@ background = dict((color_names[x], '4%s' % x) for x in range(8))
 RESET = '0'
 opt_dict = {'bold': '1', 'underscore': '4', 'blink': '5', 'reverse': '7', 'conceal': '8'}
 
+
 def colorize(text='', opts=(), **kwargs):
     """
     Returns your text, enclosed in ANSI graphics codes.
@@ -55,6 +56,7 @@ def colorize(text='', opts=(), **kwargs):
         text = '%s\x1b[%sm' % (text or '', RESET)
     return '%s%s' % (('\x1b[%sm' % ';'.join(code_list)), text or '')
 
+
 def make_style(opts=(), **kwargs):
     """
     Returns a function with default parameters for colorize()
@@ -73,65 +75,66 @@ LIGHT_PALETTE = 'light'
 
 PALETTES = {
     NOCOLOR_PALETTE: {
-        'ERROR':        {},
-        'NOTICE':       {},
-        'SQL_FIELD':    {},
-        'SQL_COLTYPE':  {},
-        'SQL_KEYWORD':  {},
-        'SQL_TABLE':    {},
-        'HTTP_INFO':         {},
-        'HTTP_SUCCESS':      {},
-        'HTTP_REDIRECT':     {},
+        'ERROR': {},
+        'NOTICE': {},
+        'SQL_FIELD': {},
+        'SQL_COLTYPE': {},
+        'SQL_KEYWORD': {},
+        'SQL_TABLE': {},
+        'HTTP_INFO': {},
+        'HTTP_SUCCESS': {},
+        'HTTP_REDIRECT': {},
         'HTTP_NOT_MODIFIED': {},
-        'HTTP_BAD_REQUEST':  {},
-        'HTTP_NOT_FOUND':    {},
+        'HTTP_BAD_REQUEST': {},
+        'HTTP_NOT_FOUND': {},
         'HTTP_SERVER_ERROR': {},
-        'MIGRATE_HEADING':   {},
-        'MIGRATE_LABEL':     {},
-        'MIGRATE_SUCCESS':   {},
-        'MIGRATE_FAILURE':   {},
+        'MIGRATE_HEADING': {},
+        'MIGRATE_LABEL': {},
+        'MIGRATE_SUCCESS': {},
+        'MIGRATE_FAILURE': {},
     },
     DARK_PALETTE: {
-        'ERROR':        {'fg': 'red', 'opts': ('bold',)},
-        'NOTICE':       {'fg': 'red'},
-        'SQL_FIELD':    {'fg': 'green', 'opts': ('bold',)},
-        'SQL_COLTYPE':  {'fg': 'green'},
-        'SQL_KEYWORD':  {'fg': 'yellow'},
-        'SQL_TABLE':    {'opts': ('bold',)},
-        'HTTP_INFO':         {'opts': ('bold',)},
-        'HTTP_SUCCESS':      {},
-        'HTTP_REDIRECT':     {'fg': 'green'},
+        'ERROR': {'fg': 'red', 'opts': ('bold',)},
+        'NOTICE': {'fg': 'red'},
+        'SQL_FIELD': {'fg': 'green', 'opts': ('bold',)},
+        'SQL_COLTYPE': {'fg': 'green'},
+        'SQL_KEYWORD': {'fg': 'yellow'},
+        'SQL_TABLE': {'opts': ('bold',)},
+        'HTTP_INFO': {'opts': ('bold',)},
+        'HTTP_SUCCESS': {},
+        'HTTP_REDIRECT': {'fg': 'green'},
         'HTTP_NOT_MODIFIED': {'fg': 'cyan'},
-        'HTTP_BAD_REQUEST':  {'fg': 'red', 'opts': ('bold',)},
-        'HTTP_NOT_FOUND':    {'fg': 'yellow'},
+        'HTTP_BAD_REQUEST': {'fg': 'red', 'opts': ('bold',)},
+        'HTTP_NOT_FOUND': {'fg': 'yellow'},
         'HTTP_SERVER_ERROR': {'fg': 'magenta', 'opts': ('bold',)},
-        'MIGRATE_HEADING':   {'fg': 'cyan', 'opts': ('bold',)},
-        'MIGRATE_LABEL':     {'opts': ('bold',)},
-        'MIGRATE_SUCCESS':   {'fg': 'green', 'opts': ('bold',)},
-        'MIGRATE_FAILURE':   {'fg': 'red', 'opts': ('bold',)},
+        'MIGRATE_HEADING': {'fg': 'cyan', 'opts': ('bold',)},
+        'MIGRATE_LABEL': {'opts': ('bold',)},
+        'MIGRATE_SUCCESS': {'fg': 'green', 'opts': ('bold',)},
+        'MIGRATE_FAILURE': {'fg': 'red', 'opts': ('bold',)},
     },
     LIGHT_PALETTE: {
-        'ERROR':        {'fg': 'red', 'opts': ('bold',)},
-        'NOTICE':       {'fg': 'red'},
-        'SQL_FIELD':    {'fg': 'green', 'opts': ('bold',)},
-        'SQL_COLTYPE':  {'fg': 'green'},
-        'SQL_KEYWORD':  {'fg': 'blue'},
-        'SQL_TABLE':    {'opts': ('bold',)},
-        'HTTP_INFO':         {'opts': ('bold',)},
-        'HTTP_SUCCESS':      {},
-        'HTTP_REDIRECT':     {'fg': 'green', 'opts': ('bold',)},
+        'ERROR': {'fg': 'red', 'opts': ('bold',)},
+        'NOTICE': {'fg': 'red'},
+        'SQL_FIELD': {'fg': 'green', 'opts': ('bold',)},
+        'SQL_COLTYPE': {'fg': 'green'},
+        'SQL_KEYWORD': {'fg': 'blue'},
+        'SQL_TABLE': {'opts': ('bold',)},
+        'HTTP_INFO': {'opts': ('bold',)},
+        'HTTP_SUCCESS': {},
+        'HTTP_REDIRECT': {'fg': 'green', 'opts': ('bold',)},
         'HTTP_NOT_MODIFIED': {'fg': 'green'},
-        'HTTP_BAD_REQUEST':  {'fg': 'red', 'opts': ('bold',)},
-        'HTTP_NOT_FOUND':    {'fg': 'red'},
+        'HTTP_BAD_REQUEST': {'fg': 'red', 'opts': ('bold',)},
+        'HTTP_NOT_FOUND': {'fg': 'red'},
         'HTTP_SERVER_ERROR': {'fg': 'magenta', 'opts': ('bold',)},
-        'MIGRATE_HEADING':   {'fg': 'cyan', 'opts': ('bold',)},
-        'MIGRATE_LABEL':     {'opts': ('bold',)},
-        'MIGRATE_SUCCESS':   {'fg': 'green', 'opts': ('bold',)},
-        'MIGRATE_FAILURE':   {'fg': 'red', 'opts': ('bold',)},
+        'MIGRATE_HEADING': {'fg': 'cyan', 'opts': ('bold',)},
+        'MIGRATE_LABEL': {'opts': ('bold',)},
+        'MIGRATE_SUCCESS': {'fg': 'green', 'opts': ('bold',)},
+        'MIGRATE_FAILURE': {'fg': 'red', 'opts': ('bold',)},
     }
 }
 DEFAULT_PALETTE = DARK_PALETTE
 
+
 def parse_color_setting(config_string):
     """Parse a DJANGO_COLORS environment variable to produce the system palette
 
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index ba9baabf34..d99c8bbd78 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -10,7 +10,7 @@ from django.utils import six
 
 __all__ = [
     'activate', 'deactivate', 'override', 'deactivate_all',
-    'get_language',  'get_language_from_request',
+    'get_language', 'get_language_from_request',
     'get_language_info', 'get_language_bidi',
     'check_for_language', 'to_locale', 'templatize', 'string_concat',
     'gettext', 'gettext_lazy', 'gettext_noop',
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index e951841884..523c86df52 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -19,38 +19,39 @@ from sphinx.util.nodes import set_source_info
 simple_option_desc_re = re.compile(
     r'([-_a-zA-Z0-9]+)(\s*.*?)(?=,\s+(?:/|-|--)|$)')
 
+
 def setup(app):
     app.add_crossref_type(
-        directivename = "setting",
-        rolename = "setting",
-        indextemplate = "pair: %s; setting",
+        directivename="setting",
+        rolename="setting",
+        indextemplate="pair: %s; setting",
     )
     app.add_crossref_type(
-        directivename = "templatetag",
-        rolename = "ttag",
-        indextemplate = "pair: %s; template tag"
+        directivename="templatetag",
+        rolename="ttag",
+        indextemplate="pair: %s; template tag"
     )
     app.add_crossref_type(
-        directivename = "templatefilter",
-        rolename = "tfilter",
-        indextemplate = "pair: %s; template filter"
+        directivename="templatefilter",
+        rolename="tfilter",
+        indextemplate="pair: %s; template filter"
     )
     app.add_crossref_type(
-        directivename = "fieldlookup",
-        rolename = "lookup",
-        indextemplate = "pair: %s; field lookup type",
+        directivename="fieldlookup",
+        rolename="lookup",
+        indextemplate="pair: %s; field lookup type",
     )
     app.add_description_unit(
-        directivename = "django-admin",
-        rolename = "djadmin",
-        indextemplate = "pair: %s; django-admin command",
-        parse_node = parse_django_admin_node,
+        directivename="django-admin",
+        rolename="djadmin",
+        indextemplate="pair: %s; django-admin command",
+        parse_node=parse_django_admin_node,
     )
     app.add_description_unit(
-        directivename = "django-admin-option",
-        rolename = "djadminopt",
-        indextemplate = "pair: %s; django-admin command-line option",
-        parse_node = parse_django_adminopt_node,
+        directivename="django-admin-option",
+        rolename="djadminopt",
+        indextemplate="pair: %s; django-admin command-line option",
+        parse_node=parse_django_adminopt_node,
     )
     app.add_config_value('django_next_version', '0.0', True)
     app.add_directive('versionadded', VersionDirective)
@@ -228,7 +229,7 @@ class DjangoHTMLTranslator(SmartyPantsHTMLTranslator):
     def visit_table(self, node):
         self.context.append(self.compact_p)
         self.compact_p = True
-        self._table_row_index = 0 # Needed by Sphinx
+        self._table_row_index = 0  # Needed by Sphinx
         self.body.append(self.starttag(node, 'table', CLASS='docutils'))
 
     def depart_table(self, node):
@@ -266,9 +267,9 @@ class DjangoHTMLTranslator(SmartyPantsHTMLTranslator):
     # that work.
     #
     version_text = {
-        'deprecated':       'Deprecated in Django %s',
-        'versionchanged':   'Changed in Django %s',
-        'versionadded':     'New in Django %s',
+        'deprecated': 'Deprecated in Django %s',
+        'versionchanged': 'Changed in Django %s',
+        'versionadded': 'New in Django %s',
     }
 
     def visit_versionmodified(self, node):
diff --git a/setup.cfg b/setup.cfg
index 986dc37cd3..dd708a5d9a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,7 @@ install-script = scripts/rpm-install.sh
 
 [flake8]
 exclude=./django/utils/dictconfig.py,./django/contrib/comments/*,./django/utils/unittest.py,./tests/comment_tests/*,./django/test/_doctest.py,./django/utils/six.py,./django/conf/app_template/*
-ignore=E124,E125,E127,E128,E226,E241,E251,E302,E501,E261,W601
+ignore=E124,E125,E127,E128,E226,E251,E302,E501,E261,W601
 
 [metadata]
 license-file = LICENSE
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"