diff --git a/setup.cfg b/setup.cfg index 643c260ff4..aec0585bc3 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 -ignore=E124,E125,E127,E128,E226,E241,E251,E302,E501,E203,E231,E261,F401,F403,W601 +ignore=E124,E125,E127,E128,E226,E241,E251,E302,E501,E203,E261,F401,F403,W601 [metadata] license-file = LICENSE diff --git a/tests/admin_scripts/management/commands/base_command.py b/tests/admin_scripts/management/commands/base_command.py index 2701f32a05..6e37ca238e 100644 --- a/tests/admin_scripts/management/commands/base_command.py +++ b/tests/admin_scripts/management/commands/base_command.py @@ -5,9 +5,9 @@ from django.core.management.base import BaseCommand class Command(BaseCommand): option_list = BaseCommand.option_list + ( - make_option('--option_a','-a', action='store', dest='option_a', default='1'), - make_option('--option_b','-b', action='store', dest='option_b', default='2'), - make_option('--option_c','-c', action='store', dest='option_c', default='3'), + make_option('--option_a', '-a', action='store', dest='option_a', default='1'), + make_option('--option_b', '-b', action='store', dest='option_b', default='2'), + make_option('--option_c', '-c', action='store', dest='option_c', default='3'), ) help = 'Test basic commands' requires_model_validation = False diff --git a/tests/admin_widgets/models.py b/tests/admin_widgets/models.py index c8e29dab8a..6a6c6e096b 100644 --- a/tests/admin_widgets/models.py +++ b/tests/admin_widgets/models.py @@ -12,7 +12,7 @@ class MyFileField(models.FileField): class Member(models.Model): name = models.CharField(max_length=100) birthdate = models.DateTimeField(blank=True, null=True) - gender = models.CharField(max_length=1, blank=True, choices=[('M','Male'), ('F', 'Female')]) + gender = models.CharField(max_length=1, blank=True, choices=[('M', 'Male'), ('F', 'Female')]) email = models.EmailField(blank=True) def __str__(self): diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index ee8b2f3bac..0aa8e98933 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -101,7 +101,7 @@ class AdminFormfieldForDBFieldTests(TestCase): def testRadioFieldsForeignKey(self): ff = self.assertFormfield(models.Event, 'main_band', widgets.AdminRadioSelect, - radio_fields={'main_band':admin.VERTICAL}) + radio_fields={'main_band': admin.VERTICAL}) self.assertEqual(ff.empty_label, None) def testManyToMany(self): @@ -126,7 +126,7 @@ class AdminFormfieldForDBFieldTests(TestCase): """ class BandAdmin(admin.ModelAdmin): formfield_overrides = { - CharField: {'widget': forms.TextInput(attrs={'size':'10'})} + CharField: {'widget': forms.TextInput(attrs={'size': '10'})} } ma = BandAdmin(models.Band, admin.site) f1 = ma.formfield_for_dbfield(models.Band._meta.get_field('name'), request=None) @@ -158,7 +158,7 @@ class AdminFormfieldForDBFieldTests(TestCase): def testChoicesWithRadioFields(self): self.assertFormfield(models.Member, 'gender', widgets.AdminRadioSelect, - radio_fields={'gender':admin.VERTICAL}) + radio_fields={'gender': admin.VERTICAL}) def testInheritance(self): self.assertFormfield(models.Album, 'backside_art', widgets.AdminFileWidget) diff --git a/tests/aggregation_regress/tests.py b/tests/aggregation_regress/tests.py index 177a83c983..2bc907662e 100644 --- a/tests/aggregation_regress/tests.py +++ b/tests/aggregation_regress/tests.py @@ -196,7 +196,7 @@ class AggregationTests(TestCase): "name": 'The Definitive Guide to Django: Web Development Done Right', }) - obj = Book.objects.annotate(mean_auth_age=Avg('authors__age')).extra(select={'price_per_page' : 'price / pages'}).values('name','mean_auth_age').get(pk=1) + obj = Book.objects.annotate(mean_auth_age=Avg('authors__age')).extra(select={'price_per_page' : 'price / pages'}).values('name', 'mean_auth_age').get(pk=1) self.assertEqual(obj, { 'mean_auth_age': 34.5, 'name': 'The Definitive Guide to Django: Web Development Done Right', @@ -346,7 +346,7 @@ class AggregationTests(TestCase): def test_aggregate_fexpr(self): # Aggregates can be used with F() expressions # ... where the F() is pushed into the HAVING clause - qs = Publisher.objects.annotate(num_books=Count('book')).filter(num_books__lt=F('num_awards')/2).order_by('name').values('name','num_books','num_awards') + qs = Publisher.objects.annotate(num_books=Count('book')).filter(num_books__lt=F('num_awards')/2).order_by('name').values('name', 'num_books', 'num_awards') self.assertQuerysetEqual( qs, [ {'num_books': 1, 'name': 'Morgan Kaufmann', 'num_awards': 9}, @@ -355,7 +355,7 @@ class AggregationTests(TestCase): lambda p: p, ) - qs = Publisher.objects.annotate(num_books=Count('book')).exclude(num_books__lt=F('num_awards')/2).order_by('name').values('name','num_books','num_awards') + qs = Publisher.objects.annotate(num_books=Count('book')).exclude(num_books__lt=F('num_awards')/2).order_by('name').values('name', 'num_books', 'num_awards') self.assertQuerysetEqual( qs, [ {'num_books': 2, 'name': 'Apress', 'num_awards': 3}, @@ -366,7 +366,7 @@ class AggregationTests(TestCase): ) # ... and where the F() references an aggregate - qs = Publisher.objects.annotate(num_books=Count('book')).filter(num_awards__gt=2*F('num_books')).order_by('name').values('name','num_books','num_awards') + qs = Publisher.objects.annotate(num_books=Count('book')).filter(num_awards__gt=2*F('num_books')).order_by('name').values('name', 'num_books', 'num_awards') self.assertQuerysetEqual( qs, [ {'num_books': 1, 'name': 'Morgan Kaufmann', 'num_awards': 9}, @@ -375,7 +375,7 @@ class AggregationTests(TestCase): lambda p: p, ) - qs = Publisher.objects.annotate(num_books=Count('book')).exclude(num_books__lt=F('num_awards')/2).order_by('name').values('name','num_books','num_awards') + qs = Publisher.objects.annotate(num_books=Count('book')).exclude(num_books__lt=F('num_awards')/2).order_by('name').values('name', 'num_books', 'num_awards') self.assertQuerysetEqual( qs, [ {'num_books': 2, 'name': 'Apress', 'num_awards': 3}, @@ -456,7 +456,7 @@ class AggregationTests(TestCase): # Regression for #10132 - If the values() clause only mentioned extra # (select=) columns, those columns are used for grouping - qs = Book.objects.extra(select={'pub':'publisher_id'}).values('pub').annotate(Count('id')).order_by('pub') + qs = Book.objects.extra(select={'pub': 'publisher_id'}).values('pub').annotate(Count('id')).order_by('pub') self.assertQuerysetEqual( qs, [ {'pub': 1, 'id__count': 2}, @@ -467,7 +467,7 @@ class AggregationTests(TestCase): lambda b: b ) - qs = Book.objects.extra(select={'pub':'publisher_id', 'foo':'pages'}).values('pub').annotate(Count('id')).order_by('pub') + qs = Book.objects.extra(select={'pub': 'publisher_id', 'foo': 'pages'}).values('pub').annotate(Count('id')).order_by('pub') self.assertQuerysetEqual( qs, [ {'pub': 1, 'id__count': 2}, diff --git a/tests/basic/models.py b/tests/basic/models.py index ee44c1658a..38cb813d42 100644 --- a/tests/basic/models.py +++ b/tests/basic/models.py @@ -14,7 +14,7 @@ class Article(models.Model): pub_date = models.DateTimeField() class Meta: - ordering = ('pub_date','headline') + ordering = ('pub_date', 'headline') def __str__(self): return self.headline diff --git a/tests/cache/tests.py b/tests/cache/tests.py index fef30f1120..02e7e54db1 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -682,55 +682,55 @@ class BaseCacheTests(object): def test_cache_versioning_get_set_many(self): # set, using default version = 1 self.cache.set_many({'ford1': 37, 'arthur1': 42}) - self.assertEqual(self.cache.get_many(['ford1','arthur1']), + self.assertEqual(self.cache.get_many(['ford1', 'arthur1']), {'ford1': 37, 'arthur1': 42}) - self.assertEqual(self.cache.get_many(['ford1','arthur1'], version=1), + self.assertEqual(self.cache.get_many(['ford1', 'arthur1'], version=1), {'ford1': 37, 'arthur1': 42}) - self.assertEqual(self.cache.get_many(['ford1','arthur1'], version=2), {}) + self.assertEqual(self.cache.get_many(['ford1', 'arthur1'], version=2), {}) - self.assertEqual(self.v2_cache.get_many(['ford1','arthur1']), {}) - self.assertEqual(self.v2_cache.get_many(['ford1','arthur1'], version=1), + self.assertEqual(self.v2_cache.get_many(['ford1', 'arthur1']), {}) + self.assertEqual(self.v2_cache.get_many(['ford1', 'arthur1'], version=1), {'ford1': 37, 'arthur1': 42}) - self.assertEqual(self.v2_cache.get_many(['ford1','arthur1'], version=2), {}) + self.assertEqual(self.v2_cache.get_many(['ford1', 'arthur1'], version=2), {}) # set, default version = 1, but manually override version = 2 self.cache.set_many({'ford2': 37, 'arthur2': 42}, version=2) - self.assertEqual(self.cache.get_many(['ford2','arthur2']), {}) - self.assertEqual(self.cache.get_many(['ford2','arthur2'], version=1), {}) - self.assertEqual(self.cache.get_many(['ford2','arthur2'], version=2), + self.assertEqual(self.cache.get_many(['ford2', 'arthur2']), {}) + self.assertEqual(self.cache.get_many(['ford2', 'arthur2'], version=1), {}) + self.assertEqual(self.cache.get_many(['ford2', 'arthur2'], version=2), {'ford2': 37, 'arthur2': 42}) - self.assertEqual(self.v2_cache.get_many(['ford2','arthur2']), + self.assertEqual(self.v2_cache.get_many(['ford2', 'arthur2']), {'ford2': 37, 'arthur2': 42}) - self.assertEqual(self.v2_cache.get_many(['ford2','arthur2'], version=1), {}) - self.assertEqual(self.v2_cache.get_many(['ford2','arthur2'], version=2), + self.assertEqual(self.v2_cache.get_many(['ford2', 'arthur2'], version=1), {}) + self.assertEqual(self.v2_cache.get_many(['ford2', 'arthur2'], version=2), {'ford2': 37, 'arthur2': 42}) # v2 set, using default version = 2 self.v2_cache.set_many({'ford3': 37, 'arthur3': 42}) - self.assertEqual(self.cache.get_many(['ford3','arthur3']), {}) - self.assertEqual(self.cache.get_many(['ford3','arthur3'], version=1), {}) - self.assertEqual(self.cache.get_many(['ford3','arthur3'], version=2), + self.assertEqual(self.cache.get_many(['ford3', 'arthur3']), {}) + self.assertEqual(self.cache.get_many(['ford3', 'arthur3'], version=1), {}) + self.assertEqual(self.cache.get_many(['ford3', 'arthur3'], version=2), {'ford3': 37, 'arthur3': 42}) - self.assertEqual(self.v2_cache.get_many(['ford3','arthur3']), + self.assertEqual(self.v2_cache.get_many(['ford3', 'arthur3']), {'ford3': 37, 'arthur3': 42}) - self.assertEqual(self.v2_cache.get_many(['ford3','arthur3'], version=1), {}) - self.assertEqual(self.v2_cache.get_many(['ford3','arthur3'], version=2), + self.assertEqual(self.v2_cache.get_many(['ford3', 'arthur3'], version=1), {}) + self.assertEqual(self.v2_cache.get_many(['ford3', 'arthur3'], version=2), {'ford3': 37, 'arthur3': 42}) # v2 set, default version = 2, but manually override version = 1 self.v2_cache.set_many({'ford4': 37, 'arthur4': 42}, version=1) - self.assertEqual(self.cache.get_many(['ford4','arthur4']), + self.assertEqual(self.cache.get_many(['ford4', 'arthur4']), {'ford4': 37, 'arthur4': 42}) - self.assertEqual(self.cache.get_many(['ford4','arthur4'], version=1), + self.assertEqual(self.cache.get_many(['ford4', 'arthur4'], version=1), {'ford4': 37, 'arthur4': 42}) - self.assertEqual(self.cache.get_many(['ford4','arthur4'], version=2), {}) + self.assertEqual(self.cache.get_many(['ford4', 'arthur4'], version=2), {}) - self.assertEqual(self.v2_cache.get_many(['ford4','arthur4']), {}) - self.assertEqual(self.v2_cache.get_many(['ford4','arthur4'], version=1), + self.assertEqual(self.v2_cache.get_many(['ford4', 'arthur4']), {}) + self.assertEqual(self.v2_cache.get_many(['ford4', 'arthur4'], version=1), {'ford4': 37, 'arthur4': 42}) - self.assertEqual(self.v2_cache.get_many(['ford4','arthur4'], version=2), {}) + self.assertEqual(self.v2_cache.get_many(['ford4', 'arthur4'], version=2), {}) def test_incr_version(self): self.cache.set('answer', 42, version=2) diff --git a/tests/csrf_tests/tests.py b/tests/csrf_tests/tests.py index 0aaacc30b5..57f8359cc7 100644 --- a/tests/csrf_tests/tests.py +++ b/tests/csrf_tests/tests.py @@ -115,7 +115,7 @@ class CsrfViewMiddlewareTest(TestCase): self.assertEqual(csrf_cookie['secure'], True) self.assertEqual(csrf_cookie['httponly'], True) self.assertEqual(csrf_cookie['path'], '/test/') - self.assertTrue('Cookie' in resp2.get('Vary','')) + self.assertTrue('Cookie' in resp2.get('Vary', '')) def test_process_response_get_token_not_used(self): """ @@ -336,7 +336,7 @@ class CsrfViewMiddlewareTest(TestCase): req = self._get_GET_no_csrf_cookie_request() resp = view(req) self.assertTrue(resp.cookies.get(settings.CSRF_COOKIE_NAME, False)) - self.assertTrue('Cookie' in resp.get('Vary','')) + self.assertTrue('Cookie' in resp.get('Vary', '')) def test_ensures_csrf_cookie_with_middleware(self): """ @@ -353,7 +353,7 @@ class CsrfViewMiddlewareTest(TestCase): resp = view(req) resp2 = CsrfViewMiddleware().process_response(req, resp) self.assertTrue(resp2.cookies.get(settings.CSRF_COOKIE_NAME, False)) - self.assertTrue('Cookie' in resp2.get('Vary','')) + self.assertTrue('Cookie' in resp2.get('Vary', '')) def test_ensures_csrf_cookie_no_logging(self): """ diff --git a/tests/custom_columns/models.py b/tests/custom_columns/models.py index 16a7838a9f..2549dde749 100644 --- a/tests/custom_columns/models.py +++ b/tests/custom_columns/models.py @@ -31,7 +31,7 @@ class Author(models.Model): class Meta: db_table = 'my_author_table' - ordering = ('last_name','first_name') + ordering = ('last_name', 'first_name') @python_2_unicode_compatible class Article(models.Model): diff --git a/tests/custom_columns_regress/models.py b/tests/custom_columns_regress/models.py index 96fe71cef8..e848b8ec23 100644 --- a/tests/custom_columns_regress/models.py +++ b/tests/custom_columns_regress/models.py @@ -35,4 +35,4 @@ class Author(models.Model): class Meta: db_table = 'my author table' - ordering = ('last_name','first_name') + ordering = ('last_name', 'first_name') diff --git a/tests/decorators/tests.py b/tests/decorators/tests.py index 65d6f9d46f..4016273ef5 100644 --- a/tests/decorators/tests.py +++ b/tests/decorators/tests.py @@ -50,7 +50,7 @@ full_decorator = compose( # django.contrib.auth.decorators # Apply user_passes_test twice to check #9474 - user_passes_test(lambda u:True), + user_passes_test(lambda u: True), login_required, permission_required('change_world'), diff --git a/tests/defaultfilters/tests.py b/tests/defaultfilters/tests.py index c520968ad3..3e785a8c70 100644 --- a/tests/defaultfilters/tests.py +++ b/tests/defaultfilters/tests.py @@ -369,7 +369,7 @@ class DefaultFiltersTests(TestCase): 'should be\nindented') self.assertEqual(wordwrap('this is a short paragraph of text.\n ' - 'But this line should be indented',15), 'this is a short\n' + 'But this line should be indented', 15), 'this is a short\n' 'paragraph of\ntext.\n But this line\nshould be\nindented') def test_rjust(self): @@ -460,16 +460,16 @@ class DefaultFiltersTests(TestCase): self.assertEqual(dictsortreversed(1, 'age'), '') def test_first(self): - self.assertEqual(first([0,1,2]), 0) + self.assertEqual(first([0, 1, 2]), 0) self.assertEqual(first(''), '') self.assertEqual(first('test'), 't') def test_join(self): - self.assertEqual(join([0,1,2], 'glue'), '0glue1glue2') + self.assertEqual(join([0, 1, 2], 'glue'), '0glue1glue2') def test_length(self): self.assertEqual(length('1234'), 4) - self.assertEqual(length([1,2,3,4]), 4) + self.assertEqual(length([1, 2, 3, 4]), 4) self.assertEqual(length_is([], 0), True) self.assertEqual(length_is([], 1), False) self.assertEqual(length_is('a', 1), True) @@ -517,7 +517,7 @@ class DefaultFiltersTests(TestCase): a = ULItem('a') b = ULItem('b') - self.assertEqual(unordered_list([a,b]), + self.assertEqual(unordered_list([a, b]), '\t
  • ulitem-a
    • \n\t
  • ulitem-b
    • ') # Old format for unordered lists should still work @@ -623,7 +623,7 @@ class DefaultFiltersTests(TestCase): self.assertEqual(filesizeformat(1024*1024*1024*1024*1024), '1.0\xa0PB') self.assertEqual(filesizeformat(1024*1024*1024*1024*1024*2000), '2000.0\xa0PB') - self.assertEqual(filesizeformat(complex(1,-1)), '0\xa0bytes') + self.assertEqual(filesizeformat(complex(1, -1)), '0\xa0bytes') self.assertEqual(filesizeformat(""), '0\xa0bytes') self.assertEqual(filesizeformat("\N{GREEK SMALL LETTER ALPHA}"), '0\xa0bytes') @@ -634,14 +634,14 @@ class DefaultFiltersTests(TestCase): self.assertEqual(pluralize(2), 's') self.assertEqual(pluralize([1]), '') self.assertEqual(pluralize([]), 's') - self.assertEqual(pluralize([1,2,3]), 's') - self.assertEqual(pluralize(1,'es'), '') - self.assertEqual(pluralize(0,'es'), 'es') - self.assertEqual(pluralize(2,'es'), 'es') - self.assertEqual(pluralize(1,'y,ies'), 'y') - self.assertEqual(pluralize(0,'y,ies'), 'ies') - self.assertEqual(pluralize(2,'y,ies'), 'ies') - self.assertEqual(pluralize(0,'y,ies,error'), '') + self.assertEqual(pluralize([1, 2, 3]), 's') + self.assertEqual(pluralize(1, 'es'), '') + self.assertEqual(pluralize(0, 'es'), 'es') + self.assertEqual(pluralize(2, 'es'), 'es') + self.assertEqual(pluralize(1, 'y,ies'), 'y') + self.assertEqual(pluralize(0, 'y,ies'), 'ies') + self.assertEqual(pluralize(2, 'y,ies'), 'ies') + self.assertEqual(pluralize(0, 'y,ies,error'), '') def test_phone2numeric(self): self.assertEqual(phone2numeric_filter('0800 flowers'), '0800 3569377') @@ -691,7 +691,7 @@ class DefaultFiltersI18NTests(TransRealMixin, TestCase): '1,0\xa0PB') self.assertEqual(filesizeformat(1024*1024*1024*1024*1024*2000), '2000,0\xa0PB') - self.assertEqual(filesizeformat(complex(1,-1)), '0\xa0Bytes') + self.assertEqual(filesizeformat(complex(1, -1)), '0\xa0Bytes') self.assertEqual(filesizeformat(""), '0\xa0Bytes') self.assertEqual(filesizeformat("\N{GREEK SMALL LETTER ALPHA}"), '0\xa0Bytes') diff --git a/tests/delete_regress/tests.py b/tests/delete_regress/tests.py index 4f6a2e7ae2..ecc754920c 100644 --- a/tests/delete_regress/tests.py +++ b/tests/delete_regress/tests.py @@ -303,7 +303,7 @@ class Ticket19102Tests(TestCase): Login.objects.order_by('description').filter( orgunit__name__isnull=False ).extra( - select={'extraf':'1'} + select={'extraf': '1'} ).filter( pk=self.l1.pk ).delete() diff --git a/tests/dispatch/tests/test_dispatcher.py b/tests/dispatch/tests/test_dispatcher.py index e25f60b0c7..9a8d7146cf 100644 --- a/tests/dispatch/tests/test_dispatcher.py +++ b/tests/dispatch/tests/test_dispatcher.py @@ -51,7 +51,7 @@ class DispatcherTests(unittest.TestCase): def testExact(self): a_signal.connect(receiver_1_arg, sender=self) - expected = [(receiver_1_arg,"test")] + expected = [(receiver_1_arg, "test")] result = a_signal.send(sender=self, val="test") self.assertEqual(result, expected) a_signal.disconnect(receiver_1_arg, sender=self) @@ -59,7 +59,7 @@ class DispatcherTests(unittest.TestCase): def testIgnoredSender(self): a_signal.connect(receiver_1_arg) - expected = [(receiver_1_arg,"test")] + expected = [(receiver_1_arg, "test")] result = a_signal.send(sender=self, val="test") self.assertEqual(result, expected) a_signal.disconnect(receiver_1_arg) diff --git a/tests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py index 505a0470bf..e14f06f2ed 100644 --- a/tests/distinct_on_fields/tests.py +++ b/tests/distinct_on_fields/tests.py @@ -63,7 +63,7 @@ class DistinctOnTests(TestCase): ['', ''], ), ( - StaffTag.objects.distinct('staff','tag'), + StaffTag.objects.distinct('staff', 'tag'), [' p1>'], ), ( diff --git a/tests/extra_regress/models.py b/tests/extra_regress/models.py index 5b4250ca8d..5523a06a8a 100644 --- a/tests/extra_regress/models.py +++ b/tests/extra_regress/models.py @@ -41,4 +41,4 @@ class TestObject(models.Model): third = models.CharField(max_length=20) def __str__(self): - return 'TestObject: %s,%s,%s' % (self.first,self.second,self.third) + return 'TestObject: %s,%s,%s' % (self.first, self.second, self.third) diff --git a/tests/extra_regress/tests.py b/tests/extra_regress/tests.py index 2f9366d224..26bf915b5a 100644 --- a/tests/extra_regress/tests.py +++ b/tests/extra_regress/tests.py @@ -180,100 +180,100 @@ class ExtraRegressTests(TestCase): obj.save() self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values()), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values()), [{'bar': 'second', 'third': 'third', 'second': 'second', 'whiz': 'third', 'foo': 'first', 'id': obj.pk, 'first': 'first'}] ) # Extra clauses after an empty values clause are still included self.assertEqual( - list(TestObject.objects.values().extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third'))))), + list(TestObject.objects.values().extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third'))))), [{'bar': 'second', 'third': 'third', 'second': 'second', 'whiz': 'third', 'foo': 'first', 'id': obj.pk, 'first': 'first'}] ) # Extra columns are ignored if not mentioned in the values() clause self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values('first', 'second')), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values('first', 'second')), [{'second': 'second', 'first': 'first'}] ) # Extra columns after a non-empty values() clause are ignored self.assertEqual( - list(TestObject.objects.values('first', 'second').extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third'))))), + list(TestObject.objects.values('first', 'second').extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third'))))), [{'second': 'second', 'first': 'first'}] ) # Extra columns can be partially returned self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values('first', 'second', 'foo')), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values('first', 'second', 'foo')), [{'second': 'second', 'foo': 'first', 'first': 'first'}] ) # Also works if only extra columns are included self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values('foo', 'whiz')), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values('foo', 'whiz')), [{'foo': 'first', 'whiz': 'third'}] ) # Values list works the same way # All columns are returned for an empty values_list() self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values_list()), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values_list()), [('first', 'second', 'third', obj.pk, 'first', 'second', 'third')] ) # Extra columns after an empty values_list() are still included self.assertEqual( - list(TestObject.objects.values_list().extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third'))))), + list(TestObject.objects.values_list().extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third'))))), [('first', 'second', 'third', obj.pk, 'first', 'second', 'third')] ) # Extra columns ignored completely if not mentioned in values_list() self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values_list('first', 'second')), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values_list('first', 'second')), [('first', 'second')] ) # Extra columns after a non-empty values_list() clause are ignored completely self.assertEqual( - list(TestObject.objects.values_list('first', 'second').extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third'))))), + list(TestObject.objects.values_list('first', 'second').extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third'))))), [('first', 'second')] ) self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values_list('second', flat=True)), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values_list('second', flat=True)), ['second'] ) # Only the extra columns specified in the values_list() are returned self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values_list('first', 'second', 'whiz')), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values_list('first', 'second', 'whiz')), [('first', 'second', 'third')] ) # ...also works if only extra columns are included self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values_list('foo','whiz')), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values_list('foo', 'whiz')), [('first', 'third')] ) self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values_list('whiz', flat=True)), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values_list('whiz', flat=True)), ['third'] ) # ... and values are returned in the order they are specified self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values_list('whiz','foo')), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values_list('whiz', 'foo')), [('third', 'first')] ) self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values_list('first','id')), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values_list('first', 'id')), [('first', obj.pk)] ) self.assertEqual( - list(TestObject.objects.extra(select=OrderedDict((('foo','first'), ('bar','second'), ('whiz','third')))).values_list('whiz', 'first', 'bar', 'id')), + list(TestObject.objects.extra(select=OrderedDict((('foo', 'first'), ('bar', 'second'), ('whiz', 'third')))).values_list('whiz', 'first', 'bar', 'id')), [('third', 'first', 'second', obj.pk)] ) diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py index 00920a8618..6616e089a6 100644 --- a/tests/file_storage/tests.py +++ b/tests/file_storage/tests.py @@ -403,7 +403,7 @@ class UnicodeFileNameTests(unittest.TestCase): out the encoding situation between doctest and this file, but the actual repr doesn't matter; it just shouldn't return a unicode object. """ - uf = UploadedFile(name='¿Cómo?',content_type='text') + uf = UploadedFile(name='¿Cómo?', content_type='text') self.assertEqual(type(uf.__repr__()), str) # Tests for a race condition on file saving (#4948). diff --git a/tests/file_uploads/tests.py b/tests/file_uploads/tests.py index a0284045bc..0f1750aeed 100644 --- a/tests/file_uploads/tests.py +++ b/tests/file_uploads/tests.py @@ -80,7 +80,7 @@ class FileUploadTests(TestCase): 'Content-Disposition: form-data; name="file"; filename="test.txt"', 'Content-Type: application/octet-stream', 'Content-Transfer-Encoding: base64', - '',])) + ''])) payload.write(b"\r\n" + base64.b64encode(force_bytes(content)) + b"\r\n") payload.write('--' + client.BOUNDARY + '--\r\n') r = { diff --git a/tests/fixtures_model_package/tests.py b/tests/fixtures_model_package/tests.py index e35f180817..b869c34329 100644 --- a/tests/fixtures_model_package/tests.py +++ b/tests/fixtures_model_package/tests.py @@ -17,7 +17,7 @@ class SampleTestCase(TestCase): "Test cases can load fixture objects into models defined in packages" self.assertEqual(Article.objects.count(), 3) self.assertQuerysetEqual( - Article.objects.all(),[ + Article.objects.all(), [ "Django conquers world!", "Copyright is fine the way it is", "Poker has no place on ESPN", diff --git a/tests/forms_tests/tests/test_extra.py b/tests/forms_tests/tests/test_extra.py index 333e8cfb41..183b5dabdf 100644 --- a/tests/forms_tests/tests/test_extra.py +++ b/tests/forms_tests/tests/test_extra.py @@ -38,7 +38,7 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin): # The forms library comes with some extra, higher-level Field and Widget def test_selectdate(self): - w = SelectDateWidget(years=('2007','2008','2009','2010','2011','2012','2013','2014','2015','2016')) + w = SelectDateWidget(years=('2007', '2008', '2009', '2010', '2011', '2012', '2013', '2014', '2015', '2016')) # Rendering the default state. self.assertHTMLEqual(w.render('mydate', ''), """""") # Using a SelectDateWidget in a form. - w = SelectDateWidget(years=('2007','2008','2009','2010','2011','2012','2013','2014','2015','2016'), required=False) + w = SelectDateWidget(years=('2007', '2008', '2009', '2010', '2011', '2012', '2013', '2014', '2015', '2016'), required=False) self.assertHTMLEqual(w.render('mydate', ''), """""") - a = GetDate({'mydate_month':'4', 'mydate_day':'1', 'mydate_year':'2008'}) + a = GetDate({'mydate_month': '4', 'mydate_day': '1', 'mydate_year': '2008'}) self.assertTrue(a.is_valid()) self.assertEqual(a.cleaned_data['mydate'], datetime.date(2008, 4, 1)) @@ -429,17 +429,17 @@ class FormsExtraTestCase(TestCase, AssertFormErrorsMixin): self.assertHTMLEqual(a['mydate'].as_hidden(), '') - b = GetDate({'mydate':'2008-4-1'}) + b = GetDate({'mydate': '2008-4-1'}) self.assertTrue(b.is_valid()) self.assertEqual(b.cleaned_data['mydate'], datetime.date(2008, 4, 1)) # Invalid dates shouldn't be allowed - c = GetDate({'mydate_month':'2', 'mydate_day':'31', 'mydate_year':'2010'}) + c = GetDate({'mydate_month': '2', 'mydate_day': '31', 'mydate_year': '2010'}) self.assertFalse(c.is_valid()) self.assertEqual(c.errors, {'mydate': ['Enter a valid date.']}) # label tag is correctly associated with month dropdown - d = GetDate({'mydate_month':'1', 'mydate_day':'1', 'mydate_year':'2010'}) + d = GetDate({'mydate_month': '1', 'mydate_day': '1', 'mydate_year': '2010'}) self.assertTrue('