Commit dfb4cb99 authored by Alasdair Nicol's avatar Alasdair Nicol Committed by Tim Graham
Browse files

Fixed #21285 -- Fixed E121,E122 pep8 warnings

parent d97bec5e

django/contrib/admin/filters.py

+2 −3
Original line number Diff line number Diff line
@@ -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)

django/contrib/admin/options.py

+7 −7
Original line number Diff line number Diff line
@@ -1199,8 +1199,8 @@ 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)

                'obj': force_text(obj_display)

            }, messages.SUCCESS)



        if self.has_change_permission(request, None):

            post_url = reverse('admin:%s_%s_changelist' %

django/test/testcases.py

+5 −6
Original line number Diff line number Diff line
@@ -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))

django/views/decorators/debug.py

+3 −2
Original line number Diff line number Diff line
@@ -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

setup.cfg

+1 −1
Original line number Diff line number Diff line
@@ -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

ignore=E123,E124,E125,E126,E127,E128,E225,E226,E241,E251,E302,E501,E121,E122,E203,E221,E227,E231,E261,E301,E303,E502,F401,F403,F841,W601

ignore=E123,E124,E125,E126,E127,E128,E225,E226,E241,E251,E302,E501,E203,E221,E227,E231,E261,E301,E303,E502,F401,F403,F841,W601



[metadata]

license-file = LICENSE

tests/signals_regress/tests.py

+3 −3

File changed.

Contains only whitespace changes.

tests/bulk_create/tests.py

+4 −4

File changed.

Contains only whitespace changes.

tests/prefetch_related/tests.py

+3 −3

File changed.

Contains only whitespace changes.

tests/test_utils/tests.py

+3 −3

File changed.

Contains only whitespace changes.

django/contrib/formtools/tests/wizard/wizardtests/urls.py

+6 −6

File changed.

Contains only whitespace changes.

django/contrib/messages/storage/base.py

+1 −1

File changed.

Contains only whitespace changes.

django/contrib/auth/tests/test_management.py

+1 −1

File changed.

Contains only whitespace changes.

django/db/models/fields/related.py

+2 −2

File changed.

Contains only whitespace changes.

tests/cache/tests.py

+1 −1

File changed.

Contains only whitespace changes.

django/conf/global_settings.py

+5 −5

File changed.

Contains only whitespace changes.

django/contrib/gis/db/models/__init__.py

+3 −3

File changed.

Contains only whitespace changes.

django/utils/jslex.py

+2 −2

File changed.

Contains only whitespace changes.

tests/forms_tests/tests/test_media.py

+46 −46

File changed.

Contains only whitespace changes.

tests/model_regress/tests.py

+1 −1

File changed.

Contains only whitespace changes.

django/db/models/fields/__init__.py

+2 −2

File changed.

Contains only whitespace changes.

tests/serializers_regress/tests.py

+14 −14

File changed.

Contains only whitespace changes.

django/db/backends/creation.py

+3 −3

File changed.

Contains only whitespace changes.

django/contrib/admin/views/main.py

+3 −3

File changed.

Contains only whitespace changes.

django/core/management/validation.py

+3 −3

File changed.

Contains only whitespace changes.

django/template/base.py

+1 −1

File changed.

Contains only whitespace changes.

django/contrib/gis/admin/widgets.py

+2 −2

File changed.

Contains only whitespace changes.

django/contrib/gis/forms/widgets.py

+2 −2

File changed.

Contains only whitespace changes.

django/contrib/messages/tests/base.py

+2 −2

File changed.

Contains only whitespace changes.

tests/template_tests/filters.py

+8 −8

File changed.

Contains only whitespace changes.

django/contrib/auth/tests/test_forms.py

+1 −1

File changed.

Contains only whitespace changes.

django/db/models/base.py

+2 −2

File changed.

Contains only whitespace changes.

docs/conf.py

+2 −2

File changed.

Contains only whitespace changes.

tests/extra_regress/tests.py

+2 −2

File changed.

Contains only whitespace changes.

tests/serializers/tests.py

+3 −3

File changed.

Contains only whitespace changes.