Commit ae48d77e authored by Tim Graham's avatar Tim Graham
Browse files

Fixed E225 pep8 warnings.

parent 51d2e1fb

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=E124,E125,E127,E128,E225,E226,E241,E251,E302,E501,E203,E231,E261,E301,F401,F403,W601

ignore=E124,E125,E127,E128,E226,E241,E251,E302,E501,E203,E231,E261,E301,F401,F403,W601



[metadata]

license-file = LICENSE

tests/distinct_on_fields/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ class DistinctOnTests(TestCase): 
            # Does combining querysets work?

            (

                (Celebrity.objects.filter(fan__in=[self.fan1, self.fan2]).

                    distinct('name').order_by('name')

                |Celebrity.objects.filter(fan__in=[self.fan3]).

                    distinct('name').order_by('name') |

                 Celebrity.objects.filter(fan__in=[self.fan3]).

                    distinct('name').order_by('name')),

                ['<Celebrity: c1>', '<Celebrity: c2>'],

            ),

tests/forms_tests/tests/test_widgets.py

+14 −3
Original line number Diff line number Diff line
@@ -340,7 +340,10 @@ class FormsWidgetTestCase(TestCase): 
</select>""")



        # Choices can be nested one level in order to create HTML optgroups:

        w.choices=(('outer1', 'Outer 1'), ('Group "1"', (('inner1', 'Inner 1'), ('inner2', 'Inner 2'))))

        w.choices = (

            ('outer1', 'Outer 1'),

            ('Group "1"', (('inner1', 'Inner 1'), ('inner2', 'Inner 2'))),

        )

        self.assertHTMLEqual(w.render('nestchoice', None), """<select name="nestchoice">

<option value="outer1">Outer 1</option>

<optgroup label="Group &quot;1&quot;">
@@ -706,7 +709,11 @@ beatle J R Ringo False""") 
    def test_nested_choices(self):

        # Choices can be nested for radio buttons:

        w = RadioSelect()

        w.choices=(('unknown', 'Unknown'), ('Audio', (('vinyl', 'Vinyl'), ('cd', 'CD'))), ('Video', (('vhs', 'VHS'), ('dvd', 'DVD'))))

        w.choices = (

            ('unknown', 'Unknown'),

            ('Audio', (('vinyl', 'Vinyl'), ('cd', 'CD'))),

            ('Video', (('vhs', 'VHS'), ('dvd', 'DVD'))),

        )

        self.assertHTMLEqual(w.render('nestchoice', 'dvd', attrs={'id':'media'}), """<ul id="media">

<li><label for="media_0"><input id="media_0" name="nestchoice" type="radio" value="unknown" /> Unknown</label></li>

<li>Audio<ul id="media_1">
@@ -721,7 +728,11 @@ beatle J R Ringo False""") 


        # Choices can be nested for checkboxes:

        w = CheckboxSelectMultiple()

        w.choices=(('unknown', 'Unknown'), ('Audio', (('vinyl', 'Vinyl'), ('cd', 'CD'))), ('Video', (('vhs', 'VHS'), ('dvd', 'DVD'))))

        w.choices = (

            ('unknown', 'Unknown'),

            ('Audio', (('vinyl', 'Vinyl'), ('cd', 'CD'))),

            ('Video', (('vhs', 'VHS'), ('dvd', 'DVD'))),

        )

        self.assertHTMLEqual(w.render('nestchoice', ('vinyl', 'dvd'), attrs={'id':'media'}), """<ul id="media">

<li><label for="media_0"><input id="media_0" name="nestchoice" type="checkbox" value="unknown" /> Unknown</label></li>

<li>Audio<ul id="media_1">

django/contrib/gis/maps/google/zoom.py

+1 −1

File changed.

Contains only whitespace changes.

tests/admin_widgets/tests.py

+1 −1

File changed.

Contains only whitespace changes.

tests/dispatch/tests/test_saferef.py

+1 −1

File changed.

Contains only whitespace changes.

tests/expressions_regress/tests.py

+6 −6

File changed.

Contains only whitespace changes.

tests/m2m_through_regress/tests.py

+1 −1

File changed.

Contains only whitespace changes.

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

+1 −1

File changed.

Contains only whitespace changes.

django/contrib/gis/geos/prototypes/prepared.py

+1 −1

File changed.

Contains only whitespace changes.

django/forms/widgets.py

+1 −1

File changed.

Contains only whitespace changes.

django/utils/datetime_safe.py

+1 −1

File changed.

Contains only whitespace changes.

tests/admin_views/admin.py

+3 −3

File changed.

Contains only whitespace changes.

django/contrib/gis/gdal/prototypes/srs.py

+1 −1

File changed.

Contains only whitespace changes.

django/contrib/gis/tests/test_geoforms.py

+7 −7

File changed.

Contains only whitespace changes.

django/contrib/redirects/models.py

+1 −1

File changed.

Contains only whitespace changes.

django/dispatch/saferef.py

+1 −1

File changed.

Contains only whitespace changes.

django/utils/dateformat.py

+1 −1

File changed.

Contains only whitespace changes.

tests/defer/models.py

+1 −1

File changed.

Contains only whitespace changes.

django/contrib/gis/gdal/geomtype.py

+1 −1

File changed.

Contains only whitespace changes.

tests/cache/tests.py

+2 −2

File changed.

Contains only whitespace changes.

tests/m2m_and_m2o/tests.py

+2 −2

File changed.

Contains only whitespace changes.

tests/validation/tests.py

+1 −1

File changed.

Contains only whitespace changes.

django/contrib/gis/db/backends/postgis/operations.py

+1 −1

File changed.

Contains only whitespace changes.

django/contrib/gis/maps/google/overlays.py

+2 −2

File changed.

Contains only whitespace changes.

django/contrib/messages/tests/base.py

+6 −6

File changed.

Contains only whitespace changes.

tests/i18n/commands/compilation.py

+6 −6

File changed.

Contains only whitespace changes.

django/contrib/gis/geos/linestring.py

+1 −1

File changed.

Contains only whitespace changes.

django/contrib/gis/tests/test_measure.py

+1 −1

File changed.

Contains only whitespace changes.

tests/i18n/commands/extraction.py

+4 −4

File changed.

Contains only whitespace changes.

tests/model_forms/tests.py

+1 −1

File changed.

Contains only whitespace changes.

tests/queries/tests.py

+3 −3

File changed.

Contains only whitespace changes.

django/core/management/commands/makemessages.py

+1 −1

File changed.

Contains only whitespace changes.

django/utils/datastructures.py

+1 −1

File changed.

Contains only whitespace changes.

tests/admin_inlines/admin.py

+2 −2

File changed.

Contains only whitespace changes.

tests/backends/tests.py

+2 −2

File changed.

Contains only whitespace changes.

django/contrib/gis/maps/google/gmap.py

+1 −1

File changed.

Contains only whitespace changes.

django/contrib/sites/managers.py

+1 −1

File changed.

Contains only whitespace changes.

docs/conf.py

+1 −1

File changed.

Contains only whitespace changes.

tests/admin_validation/tests.py

+1 −1

File changed.

Contains only whitespace changes.

tests/model_inheritance_regress/tests.py

+1 −1

File changed.

Contains only whitespace changes.

tests/multiple_database/tests.py

+3 −3

File changed.

Contains only whitespace changes.

tests/select_related_regress/tests.py

+12 −12

File changed.

Contains only whitespace changes.