From f67e18f39eef898ee99120bb3913a34a1c118089 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 3 Nov 2013 10:17:58 -0800 Subject: [PATCH] Fixed all E251 violations --- setup.cfg | 2 +- tests/datatypes/tests.py | 2 +- tests/force_insert_update/models.py | 2 +- tests/forms_tests/tests/test_fields.py | 2 +- tests/forms_tests/tests/test_media.py | 16 +++++++-------- tests/forms_tests/tests/test_validators.py | 8 ++++---- tests/initial_sql_regress/models.py | 2 +- tests/migrations/test_operations.py | 2 +- tests/migrations/test_optimizer.py | 2 +- tests/null_fk/tests.py | 4 ++-- tests/properties/tests.py | 2 +- tests/schema/tests.py | 24 +++++++++++----------- tests/select_related_regress/tests.py | 4 ++-- tests/signed_cookies_tests/tests.py | 2 +- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/setup.cfg b/setup.cfg index f2191511d99..73e8693dea3 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,E251,E501,W601 +ignore=E124,E125,E127,E128,E501,W601 [metadata] license-file = LICENSE diff --git a/tests/datatypes/tests.py b/tests/datatypes/tests.py index 3cd954d3ad7..9cc88e9a660 100644 --- a/tests/datatypes/tests.py +++ b/tests/datatypes/tests.py @@ -61,7 +61,7 @@ class DataTypesTestCase(TestCase): Donut.objects.filter(baked_date__year=2006)[0].name) Donut.objects.create(name='Apple Fritter', - consumed_at = datetime.datetime(year=2007, month=4, day=20, hour=16, minute=19, second=59)) + consumed_at=datetime.datetime(year=2007, month=4, day=20, hour=16, minute=19, second=59)) self.assertEqual(['Apple Fritter', 'Date Test 2007'], list(Donut.objects.filter(consumed_at__year=2007).order_by('name').values_list('name', flat=True))) diff --git a/tests/force_insert_update/models.py b/tests/force_insert_update/models.py index 7067613ccd8..a98eadb4f92 100644 --- a/tests/force_insert_update/models.py +++ b/tests/force_insert_update/models.py @@ -6,7 +6,7 @@ from django.db import models class Counter(models.Model): - name = models.CharField(max_length = 10) + name = models.CharField(max_length=10) value = models.IntegerField() diff --git a/tests/forms_tests/tests/test_fields.py b/tests/forms_tests/tests/test_fields.py index d7eb86f3995..a7e124a50ce 100644 --- a/tests/forms_tests/tests/test_fields.py +++ b/tests/forms_tests/tests/test_fields.py @@ -691,7 +691,7 @@ class FieldsTests(SimpleTestCase): self.assertEqual(SimpleUploadedFile, type(f.clean(SimpleUploadedFile('name', b'Some File Content'), 'files/test4.pdf'))) def test_filefield_2(self): - f = FileField(max_length = 5) + f = FileField(max_length=5) self.assertRaisesMessage(ValidationError, "'Ensure this filename has at most 5 characters (it has 18).'", f.clean, SimpleUploadedFile('test_maxlength.txt', b'hello world')) self.assertEqual('files/test1.pdf', f.clean('', 'files/test1.pdf')) self.assertEqual('files/test2.pdf', f.clean(None, 'files/test2.pdf')) diff --git a/tests/forms_tests/tests/test_media.py b/tests/forms_tests/tests/test_media.py index ab00b444950..492655505cd 100644 --- a/tests/forms_tests/tests/test_media.py +++ b/tests/forms_tests/tests/test_media.py @@ -133,7 +133,7 @@ class FormsMediaTestCase(TestCase): # Widget media can be defined as a property class MyWidget4(TextInput): def _media(self): - return Media(css={'all': ('/some/path',)}, js = ('/some/js',)) + return Media(css={'all': ('/some/path',)}, js=('/some/js',)) media = property(_media) w4 = MyWidget4() @@ -143,7 +143,7 @@ class FormsMediaTestCase(TestCase): # Media properties can reference the media of their parents class MyWidget5(MyWidget4): def _media(self): - return super(MyWidget5, self).media + Media(css={'all': ('/other/path',)}, js = ('/other/js',)) + return super(MyWidget5, self).media + Media(css={'all': ('/other/path',)}, js=('/other/js',)) media = property(_media) w5 = MyWidget5() @@ -164,7 +164,7 @@ class FormsMediaTestCase(TestCase): class MyWidget6(MyWidget1): def _media(self): - return super(MyWidget6, self).media + Media(css={'all': ('/other/path',)}, js = ('/other/js',)) + return super(MyWidget6, self).media + Media(css={'all': ('/other/path',)}, js=('/other/js',)) media = property(_media) w6 = MyWidget6() @@ -228,7 +228,7 @@ class FormsMediaTestCase(TestCase): class MyWidget4(TextInput): def _media(self): - return Media(css={'all': ('/some/path',)}, js = ('/some/js',)) + return Media(css={'all': ('/some/path',)}, js=('/some/js',)) media = property(_media) class MyWidget9(MyWidget4): @@ -585,7 +585,7 @@ class StaticFormsMediaTestCase(TestCase): # Widget media can be defined as a property class MyWidget4(TextInput): def _media(self): - return Media(css={'all': ('/some/path',)}, js = ('/some/js',)) + return Media(css={'all': ('/some/path',)}, js=('/some/js',)) media = property(_media) w4 = MyWidget4() @@ -595,7 +595,7 @@ class StaticFormsMediaTestCase(TestCase): # Media properties can reference the media of their parents class MyWidget5(MyWidget4): def _media(self): - return super(MyWidget5, self).media + Media(css={'all': ('/other/path',)}, js = ('/other/js',)) + return super(MyWidget5, self).media + Media(css={'all': ('/other/path',)}, js=('/other/js',)) media = property(_media) w5 = MyWidget5() @@ -616,7 +616,7 @@ class StaticFormsMediaTestCase(TestCase): class MyWidget6(MyWidget1): def _media(self): - return super(MyWidget6, self).media + Media(css={'all': ('/other/path',)}, js = ('/other/js',)) + return super(MyWidget6, self).media + Media(css={'all': ('/other/path',)}, js=('/other/js',)) media = property(_media) w6 = MyWidget6() @@ -680,7 +680,7 @@ class StaticFormsMediaTestCase(TestCase): class MyWidget4(TextInput): def _media(self): - return Media(css={'all': ('/some/path',)}, js = ('/some/js',)) + return Media(css={'all': ('/some/path',)}, js=('/some/js',)) media = property(_media) class MyWidget9(MyWidget4): diff --git a/tests/forms_tests/tests/test_validators.py b/tests/forms_tests/tests/test_validators.py index 08fb96618c4..bd098d150a2 100644 --- a/tests/forms_tests/tests/test_validators.py +++ b/tests/forms_tests/tests/test_validators.py @@ -9,15 +9,15 @@ from django.core.exceptions import ValidationError class UserForm(forms.Form): full_name = forms.CharField( - max_length = 50, - validators = [ + max_length=50, + validators=[ validators.validate_integer, validators.validate_email, ] ) string = forms.CharField( - max_length = 50, - validators = [ + max_length=50, + validators=[ validators.RegexValidator( regex='^[a-zA-Z]*$', message="Letters only.", diff --git a/tests/initial_sql_regress/models.py b/tests/initial_sql_regress/models.py index f23ceefce32..146a7ea6910 100644 --- a/tests/initial_sql_regress/models.py +++ b/tests/initial_sql_regress/models.py @@ -6,4 +6,4 @@ from django.db import models class Simple(models.Model): - name = models.CharField(max_length = 50) + name = models.CharField(max_length=50) diff --git a/tests/migrations/test_operations.py b/tests/migrations/test_operations.py index 92f7c944626..9121755000d 100644 --- a/tests/migrations/test_operations.py +++ b/tests/migrations/test_operations.py @@ -303,7 +303,7 @@ class OperationTests(MigrationTestBase): operation = migrations.RunSQL( "CREATE TABLE i_love_ponies (id int, special_thing int)", "DROP TABLE i_love_ponies", - state_operations = [migrations.CreateModel("SomethingElse", [("id", models.AutoField(primary_key=True))])], + state_operations=[migrations.CreateModel("SomethingElse", [("id", models.AutoField(primary_key=True))])], ) # Test the state alteration new_state = project_state.clone() diff --git a/tests/migrations/test_optimizer.py b/tests/migrations/test_optimizer.py index 1564ba91b4d..7a481c905c8 100644 --- a/tests/migrations/test_optimizer.py +++ b/tests/migrations/test_optimizer.py @@ -64,7 +64,7 @@ class OptimizerTests(TestCase): self.assertOptimizesTo( [migrations.DeleteModel("Foo")], [migrations.DeleteModel("Foo")], - exact = 1, + exact=1, ) def test_create_delete_model(self): diff --git a/tests/null_fk/tests.py b/tests/null_fk/tests.py index d5b68658ff8..696c7a3035b 100644 --- a/tests/null_fk/tests.py +++ b/tests/null_fk/tests.py @@ -31,7 +31,7 @@ class NullFkTests(TestCase): (c1.id, 'My first comment', ''), (c2.id, 'My second comment', 'None') ], - transform = lambda c: (c.id, c.comment_text, repr(c.post)) + transform=lambda c: (c.id, c.comment_text, repr(c.post)) ) # Regression test for #7530, #7716. @@ -43,7 +43,7 @@ class NullFkTests(TestCase): (c1.id, 'My first comment', ''), (c2.id, 'My second comment', 'None') ], - transform = lambda c: (c.id, c.comment_text, repr(c.post)) + transform=lambda c: (c.id, c.comment_text, repr(c.post)) ) def test_combine_isnull(self): diff --git a/tests/properties/tests.py b/tests/properties/tests.py index c471c414a17..3db8fbf0f8d 100644 --- a/tests/properties/tests.py +++ b/tests/properties/tests.py @@ -19,6 +19,6 @@ class PropertyTests(TestCase): self.assertRaises(AttributeError, setattr, self.a, 'full_name', 'Paul McCartney') # But "full_name_2" has, and it can be used to initialise the class. - a2 = Person(full_name_2 = 'Paul McCartney') + a2 = Person(full_name_2='Paul McCartney') a2.save() self.assertEqual(a2.first_name, 'Paul') diff --git a/tests/schema/tests.py b/tests/schema/tests.py index d3a22456737..ce6a1128e7d 100644 --- a/tests/schema/tests.py +++ b/tests/schema/tests.py @@ -106,9 +106,9 @@ class SchemaTests(TransactionTestCase): # Make sure the FK constraint is present with self.assertRaises(IntegrityError): Book.objects.create( - author_id = 1, - title = "Much Ado About Foreign Keys", - pub_date = datetime.datetime.now(), + author_id=1, + title="Much Ado About Foreign Keys", + pub_date=datetime.datetime.now(), ) # Repoint the FK constraint new_field = ForeignKey(Tag) @@ -211,7 +211,7 @@ class SchemaTests(TransactionTestCase): Author, Author._meta.get_field_by_name("name")[0], new_field, - strict = True, + strict=True, ) # Ensure the field is right afterwards columns = self.column_classes(Author) @@ -337,7 +337,7 @@ class SchemaTests(TransactionTestCase): Author, Author._meta.get_field_by_name("height")[0], new_field, - strict = True, + strict=True, ) constraints = connection.introspection.get_constraints(connection.cursor(), Author._meta.db_table) for name, details in constraints.items(): @@ -349,7 +349,7 @@ class SchemaTests(TransactionTestCase): Author, new_field, Author._meta.get_field_by_name("height")[0], - strict = True, + strict=True, ) constraints = connection.introspection.get_constraints(connection.cursor(), Author._meta.db_table) for name, details in constraints.items(): @@ -377,7 +377,7 @@ class SchemaTests(TransactionTestCase): Tag, Tag._meta.get_field_by_name("slug")[0], new_field, - strict = True, + strict=True, ) # Ensure the field is no longer unique Tag.objects.create(title="foo", slug="foo") @@ -391,7 +391,7 @@ class SchemaTests(TransactionTestCase): Tag, new_field, new_new_field, - strict = True, + strict=True, ) # Ensure the field is unique again Tag.objects.create(title="foo", slug="foo") @@ -405,7 +405,7 @@ class SchemaTests(TransactionTestCase): Tag, Tag._meta.get_field_by_name("slug")[0], TagUniqueRename._meta.get_field_by_name("slug2")[0], - strict = True, + strict=True, ) # Ensure the field is still unique TagUniqueRename.objects.create(title="foo", slug2="foo") @@ -572,7 +572,7 @@ class SchemaTests(TransactionTestCase): Book, Book._meta.get_field_by_name("title")[0], new_field, - strict = True, + strict=True, ) # Ensure the table is there and has no index self.assertNotIn( @@ -585,7 +585,7 @@ class SchemaTests(TransactionTestCase): Book, new_field, Book._meta.get_field_by_name("title")[0], - strict = True, + strict=True, ) # Ensure the table is there and has the index again self.assertIn( @@ -610,7 +610,7 @@ class SchemaTests(TransactionTestCase): BookWithSlug, BookWithSlug._meta.get_field_by_name("slug")[0], new_field2, - strict = True, + strict=True, ) self.assertNotIn( "slug", diff --git a/tests/select_related_regress/tests.py b/tests/select_related_regress/tests.py index 7b1455753d3..78d58381094 100644 --- a/tests/select_related_regress/tests.py +++ b/tests/select_related_regress/tests.py @@ -58,8 +58,8 @@ class SelectRelatedRegressTests(TestCase): usp = Person.objects.create(user=us) uo = TUser.objects.create(name="org") uop = Person.objects.create(user=uo) - s = Student.objects.create(person = usp) - o = Organizer.objects.create(person = uop) + s = Student.objects.create(person=usp) + o = Organizer.objects.create(person=uop) c = Class.objects.create(org=o) Enrollment.objects.create(std=s, cls=c) diff --git a/tests/signed_cookies_tests/tests.py b/tests/signed_cookies_tests/tests.py index 800092a2d7a..6878a3c54f2 100644 --- a/tests/signed_cookies_tests/tests.py +++ b/tests/signed_cookies_tests/tests.py @@ -59,6 +59,6 @@ class SignedCookieTest(TestCase): self.assertEqual(request.get_signed_cookie('c', max_age=12), value) self.assertEqual(request.get_signed_cookie('c', max_age=11), value) self.assertRaises(signing.SignatureExpired, - request.get_signed_cookie, 'c', max_age = 10) + request.get_signed_cookie, 'c', max_age=10) finally: time.time = _time