Fixed #21285 -- Fixed E121,E122 pep8 warnings

21 files changed, 58 insertions, 59 deletions

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 6dd25e18f9..377c010b32 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -198,7 +198,7 @@ TEMPLATE_DIRS = ()
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
+    # 'django.template.loaders.eggs.Loader',
 )
 
 # List of processors used by RequestContext to populate the context.
@@ -211,7 +211,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.core.context_processors.static',
     'django.core.context_processors.tz',
-#    'django.core.context_processors.request',
+    # 'django.core.context_processors.request',
     'django.contrib.messages.context_processors.messages',
 )
 
@@ -456,8 +456,8 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
-#     'django.middleware.http.ConditionalGetMiddleware',
-#     'django.middleware.gzip.GZipMiddleware',
+    # 'django.middleware.http.ConditionalGetMiddleware',
+    # 'django.middleware.gzip.GZipMiddleware',
 )
 
 ############
@@ -607,7 +607,7 @@ STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    # 'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 ##############
diff --git a/django/contrib/admin/filters.py b/django/contrib/admin/filters.py
index 9c5fbf7d8c..5f9d69dee4 100644
--- a/django/contrib/admin/filters.py
+++ b/django/contrib/admin/filters.py
@@ -166,9 +166,8 @@ class RelatedFieldListFilter(FieldListFilter):
             rel_name = other_model._meta.pk.name
         self.lookup_kwarg = '%s__%s__exact' % (field_path, rel_name)
         self.lookup_kwarg_isnull = '%s__isnull' % field_path
-        self.lookup_val = request.GET.get(self.lookup_kwarg, None)
-        self.lookup_val_isnull = request.GET.get(
-                                      self.lookup_kwarg_isnull, None)
+        self.lookup_val = request.GET.get(self.lookup_kwarg)
+        self.lookup_val_isnull = request.GET.get(self.lookup_kwarg_isnull)
         self.lookup_choices = field.get_choices(include_blank=False)
         super(RelatedFieldListFilter, self).__init__(
             field, request, params, model, model_admin, field_path)
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index e27672773c..6d3195a868 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1198,9 +1198,9 @@ class ModelAdmin(BaseModelAdmin):
 
         self.message_user(request, _(
             'The %(name)s "%(obj)s" was deleted successfully.') % {
-                                   'name': force_text(opts.verbose_name),
-                                   'obj': force_text(obj_display)},
-                          messages.SUCCESS)
+                'name': force_text(opts.verbose_name),
+                'obj': force_text(obj_display)
+            }, messages.SUCCESS)
 
         if self.has_change_permission(request, None):
             post_url = reverse('admin:%s_%s_changelist' %
@@ -1221,10 +1221,10 @@ class ModelAdmin(BaseModelAdmin):
 
         return TemplateResponse(request,
             self.delete_confirmation_template or [
-            "admin/{}/{}/delete_confirmation.html".format(app_label, opts.model_name),
-            "admin/{}/delete_confirmation.html".format(app_label),
-            "admin/delete_confirmation.html"
-       ], context, current_app=self.admin_site.name)
+                "admin/{}/{}/delete_confirmation.html".format(app_label, opts.model_name),
+                "admin/{}/delete_confirmation.html".format(app_label),
+                "admin/delete_confirmation.html"
+            ], context, current_app=self.admin_site.name)
 
     @csrf_protect_m
     @transaction.atomic
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index dbe59f831b..04977eeef8 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -49,9 +49,9 @@ def _is_changelist_popup(request):
     IS_LEGACY_POPUP_VAR = 'pop'
     if IS_LEGACY_POPUP_VAR in request.GET:
         warnings.warn(
-        "The `%s` GET parameter has been renamed to `%s`." %
-        (IS_LEGACY_POPUP_VAR, IS_POPUP_VAR),
-        DeprecationWarning, 2)
+            "The `%s` GET parameter has been renamed to `%s`." %
+            (IS_LEGACY_POPUP_VAR, IS_POPUP_VAR),
+            DeprecationWarning, 2)
         return True
 
     return False
diff --git a/django/contrib/auth/tests/test_forms.py b/django/contrib/auth/tests/test_forms.py
index fa21d2f917..718e8fff18 100644
--- a/django/contrib/auth/tests/test_forms.py
+++ b/django/contrib/auth/tests/test_forms.py
@@ -106,7 +106,7 @@ class AuthenticationFormTest(TestCase):
         self.assertFalse(form.is_valid())
         self.assertEqual(form.non_field_errors(),
                 [force_text(form.error_messages['invalid_login'] % {
-                   'username': User._meta.get_field('username').verbose_name
+                    'username': User._meta.get_field('username').verbose_name
                 })])
 
     def test_inactive_user(self):
diff --git a/django/contrib/auth/tests/test_management.py b/django/contrib/auth/tests/test_management.py
index edf433c835..795b72b52e 100644
--- a/django/contrib/auth/tests/test_management.py
+++ b/django/contrib/auth/tests/test_management.py
@@ -217,7 +217,7 @@ class PermissionTestCase(TestCase):
         """
         # check duplicated default permission
         models.Permission._meta.permissions = [
-           ('change_permission', 'Can edit permission (duplicate)')]
+            ('change_permission', 'Can edit permission (duplicate)')]
         six.assertRaisesRegex(self, CommandError,
             "The permission codename 'change_permission' clashes with a "
             "builtin permission for model 'auth.Permission'.",
diff --git a/django/contrib/formtools/tests/wizard/wizardtests/urls.py b/django/contrib/formtools/tests/wizard/wizardtests/urls.py
index dabce5306a..d2e7c575cc 100644
--- a/django/contrib/formtools/tests/wizard/wizardtests/urls.py
+++ b/django/contrib/formtools/tests/wizard/wizardtests/urls.py
@@ -13,10 +13,10 @@ urlpatterns = patterns('',
          ('form2', Page2),
          ('form3', Page3),
          ('form4', Page4)])),
-     url(r'^wiz_other_template/$', CookieContactWizard.as_view(
-         [('form1', Page1),
-          ('form2', Page2),
-          ('form3', Page3),
-          ('form4', Page4)],
-          template_name='other_wizard_form.html')),
+    url(r'^wiz_other_template/$', CookieContactWizard.as_view(
+        [('form1', Page1),
+         ('form2', Page2),
+         ('form3', Page3),
+         ('form4', Page4)],
+        template_name='other_wizard_form.html')),
 )
diff --git a/django/contrib/gis/admin/widgets.py b/django/contrib/gis/admin/widgets.py
index 0011223617..8c90195f8e 100644
--- a/django/contrib/gis/admin/widgets.py
+++ b/django/contrib/gis/admin/widgets.py
@@ -36,7 +36,7 @@ class OpenLayersWidget(Textarea):
             except (GEOSException, ValueError) as err:
                 logger.error(
                     "Error creating geometry from value '%s' (%s)" % (
-                    value, err)
+                        value, err)
                 )
                 value = None
 
@@ -68,7 +68,7 @@ class OpenLayersWidget(Textarea):
                 except OGRException as err:
                     logger.error(
                         "Error transforming geometry from srid '%s' to srid '%s' (%s)" % (
-                        value.srid, srid, err)
+                            value.srid, srid, err)
                     )
                     wkt = ''
             else:
diff --git a/django/contrib/gis/db/models/__init__.py b/django/contrib/gis/db/models/__init__.py
index e36aa36fc2..19e85b1364 100644
--- a/django/contrib/gis/db/models/__init__.py
+++ b/django/contrib/gis/db/models/__init__.py
@@ -9,6 +9,6 @@ from django.contrib.gis.db.models.manager import GeoManager
 
 # The geographic-enabled fields.
 from django.contrib.gis.db.models.fields import (
-     GeometryField, PointField, LineStringField, PolygonField,
-     MultiPointField, MultiLineStringField, MultiPolygonField,
-     GeometryCollectionField)
+    GeometryField, PointField, LineStringField, PolygonField,
+    MultiPointField, MultiLineStringField, MultiPolygonField,
+    GeometryCollectionField)
diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py
index e8322b950c..0b08624cc9 100644
--- a/django/contrib/gis/forms/widgets.py
+++ b/django/contrib/gis/forms/widgets.py
@@ -43,7 +43,7 @@ class BaseGeometryWidget(Widget):
         except (GEOSException, ValueError) as err:
             logger.error(
                 "Error creating geometry from value '%s' (%s)" % (
-                value, err)
+                    value, err)
             )
         return None
 
@@ -63,7 +63,7 @@ class BaseGeometryWidget(Widget):
                 except gdal.OGRException as err:
                     logger.error(
                         "Error transforming geometry from srid '%s' to srid '%s' (%s)" % (
-                        value.srid, self.map_srid, err)
+                            value.srid, self.map_srid, err)
                     )
 
         context = self.build_attrs(attrs,
diff --git a/django/contrib/messages/storage/base.py b/django/contrib/messages/storage/base.py
index c021fbd2ae..f682a9bbc3 100644
--- a/django/contrib/messages/storage/base.py
+++ b/django/contrib/messages/storage/base.py
@@ -34,7 +34,7 @@ class Message(object):
 
     def __eq__(self, other):
         return isinstance(other, Message) and self.level == other.level and \
-                                              self.message == other.message
+            self.message == other.message
 
     def __str__(self):
         return force_text(self.message)
diff --git a/django/contrib/messages/tests/base.py b/django/contrib/messages/tests/base.py
index b17883959f..5ed12a7e46 100644
--- a/django/contrib/messages/tests/base.py
+++ b/django/contrib/messages/tests/base.py
@@ -219,7 +219,7 @@ class BaseTests(object):
             lambda m:'MessageMiddleware' not in m, settings.MIDDLEWARE_CLASSES),
         TEMPLATE_CONTEXT_PROCESSORS=filter(
             lambda p:'context_processors.messages' not in p,
-                 settings.TEMPLATE_CONTEXT_PROCESSORS),
+            settings.TEMPLATE_CONTEXT_PROCESSORS),
         MESSAGE_LEVEL=constants.DEBUG
     )
     def test_middleware_disabled(self):
@@ -244,7 +244,7 @@ class BaseTests(object):
             lambda m:'MessageMiddleware' not in m, settings.MIDDLEWARE_CLASSES),
         TEMPLATE_CONTEXT_PROCESSORS=filter(
             lambda p:'context_processors.messages' not in p,
-                 settings.TEMPLATE_CONTEXT_PROCESSORS),
+            settings.TEMPLATE_CONTEXT_PROCESSORS),
         MESSAGE_LEVEL=constants.DEBUG
     )
     def test_middleware_disabled_fail_silently(self):
diff --git a/django/core/management/validation.py b/django/core/management/validation.py
index 9beb47e542..4ec421c699 100644
--- a/django/core/management/validation.py
+++ b/django/core/management/validation.py
@@ -251,9 +251,9 @@ def get_validation_errors(outfile, app=None):
                                     "than one foreign key to %s, which is "
                                     "ambiguous and is not permitted." % (
                                         f.rel.through._meta.object_name,
-                                         from_model._meta.object_name
-                                     )
-                                 )
+                                        from_model._meta.object_name
+                                    )
+                                )
                             else:
                                 seen_from = True
                         elif rel_to == to_model:
diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py
index e4c870c01b..866031447d 100644
--- a/django/db/backends/creation.py
+++ b/django/db/backends/creation.py
@@ -439,9 +439,9 @@ class BaseDatabaseCreation(object):
         settings_dict['NAME'] = old_database_name
         backend = load_backend(settings_dict['ENGINE'])
         new_connection = backend.DatabaseWrapper(
-                             settings_dict,
-                             alias='__destroy_test_db__',
-                             allow_thread_sharing=False)
+            settings_dict,
+            alias='__destroy_test_db__',
+            allow_thread_sharing=False)
         new_connection.creation._destroy_test_db(test_database_name, verbosity)
 
     def _destroy_test_db(self, test_database_name, verbosity):
diff --git a/django/db/models/base.py b/django/db/models/base.py
index c7c62ea367..cd872a3559 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -566,8 +566,8 @@ class Model(six.with_metaclass(ModelBase)):
             deferred_fields = [
                 f.attname for f in self._meta.fields
                 if f.attname not in self.__dict__
-                   and isinstance(self.__class__.__dict__[f.attname],
-                                  DeferredAttribute)]
+                    and isinstance(self.__class__.__dict__[f.attname],
+                                   DeferredAttribute)]
 
             loaded_fields = field_names.difference(deferred_fields)
             if loaded_fields:
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 019714af6e..8fe1c9e4e4 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -704,7 +704,7 @@ class AutoField(Field):
 
     def __init__(self, *args, **kwargs):
         assert kwargs.get('primary_key', False) is True, \
-               "%ss must have primary_key=True." % self.__class__.__name__
+            "%ss must have primary_key=True." % self.__class__.__name__
         kwargs['blank'] = True
         Field.__init__(self, *args, **kwargs)
 
@@ -746,7 +746,7 @@ class AutoField(Field):
 
     def contribute_to_class(self, cls, name):
         assert not cls._meta.has_auto_field, \
-               "A model can't have more than one AutoField."
+            "A model can't have more than one AutoField."
         super(AutoField, self).contribute_to_class(cls, name)
         cls._meta.has_auto_field = True
         cls._meta.auto_field = self
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index 8252cce672..f82fdc91b9 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -1247,8 +1247,8 @@ class ForeignKey(ForeignObject):
 
         using = router.db_for_read(model_instance.__class__, instance=model_instance)
         qs = self.rel.to._default_manager.using(using).filter(
-          **{self.rel.field_name: value}
-         )
+            **{self.rel.field_name: value}
+        )
         qs = qs.complex_filter(self.rel.limit_choices_to)
         if not qs.exists():
             raise exceptions.ValidationError(
diff --git a/django/template/base.py b/django/template/base.py
index 39b3bcae5c..b1df21f519 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -515,7 +515,7 @@ filter_raw_string = r"""
     'var_chars': "\w\.",
     'filter_sep': re.escape(FILTER_SEPARATOR),
     'arg_sep': re.escape(FILTER_ARGUMENT_SEPARATOR),
-  }
+}
 
 filter_re = re.compile(filter_raw_string, re.UNICODE | re.VERBOSE)
 
diff --git a/django/test/testcases.py b/django/test/testcases.py
index 3ce96b09b9..fb6d518427 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -282,8 +282,7 @@ class SimpleTestCase(unittest.TestCase):
                     " response code was %d (expected %d)" %
                         (path, redirect_response.status_code, target_status_code))
 
-        e_scheme, e_netloc, e_path, e_query, e_fragment = urlsplit(
-                                                              expected_url)
+        e_scheme, e_netloc, e_path, e_query, e_fragment = urlsplit(expected_url)
         if not (e_scheme or e_netloc):
             expected_url = urlunsplit(('http', host or 'testserver', e_path,
                 e_query, e_fragment))
@@ -850,10 +849,10 @@ class TestCase(TransactionTestCase):
                 try:
                     call_command('loaddata', *self.fixtures,
                                  **{
-                                    'verbosity': 0,
-                                    'commit': False,
-                                    'database': db_name,
-                                    'skip_validation': True,
+                                     'verbosity': 0,
+                                     'commit': False,
+                                     'database': db_name,
+                                     'skip_validation': True,
                                  })
                 except Exception:
                     self._fixture_teardown()
diff --git a/django/utils/jslex.py b/django/utils/jslex.py
index c17d751faa..f042d2e5ee 100644
--- a/django/utils/jslex.py
+++ b/django/utils/jslex.py
@@ -145,12 +145,12 @@ class JsLexer(Lexer):
     states = {
         'div': # slash will mean division
             both_before + [
-            Tok("punct", literals("/= /"), next='reg'),
+                Tok("punct", literals("/= /"), next='reg'),
             ] + both_after,
 
         'reg':  # slash will mean regex
             both_before + [
-            Tok("regex",
+                Tok("regex",
                 r"""
                     /                       # opening slash
                     # First character is..
diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py
index a611981e79..318759f052 100644
--- a/django/views/decorators/debug.py
+++ b/django/views/decorators/debug.py
@@ -65,8 +65,9 @@ def sensitive_post_parameters(*parameters):
         @functools.wraps(view)
         def sensitive_post_parameters_wrapper(request, *args, **kwargs):
             assert isinstance(request, HttpRequest), (
-              "sensitive_post_parameters didn't receive an HttpRequest. If you "
-              "are decorating a classmethod, be sure to use @method_decorator."
+                "sensitive_post_parameters didn't receive an HttpRequest. "
+                "If you are decorating a classmethod, be sure to use "
+                "@method_decorator."
             )
             if parameters:
                 request.sensitive_post_parameters = parameters