From 362813d6287925b8f63f0b107c55a74d95f5825e Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 16 Mar 2018 10:54:34 +0100 Subject: [PATCH] Fixed hanging indentation in various code. --- django/contrib/messages/storage/fallback.py | 3 +- django/core/mail/message.py | 3 +- django/db/backends/postgresql/base.py | 3 +- django/forms/forms.py | 9 +- django/middleware/common.py | 3 +- django/test/runner.py | 3 +- django/utils/translation/trans_real.py | 3 +- tests/admin_views/admin.py | 9 +- tests/annotations/tests.py | 10 +- tests/auth_tests/test_auth_backends.py | 4 +- tests/check_framework/test_security.py | 91 ++++++++------ tests/defer/tests.py | 3 +- tests/delete_regress/tests.py | 9 +- tests/expressions/models.py | 6 +- tests/expressions/tests.py | 21 ++-- tests/fixtures/tests.py | 3 +- tests/foreign_object/models/person.py | 3 +- tests/forms_tests/models.py | 3 +- tests/forms_tests/tests/test_forms.py | 8 +- tests/i18n/test_extraction.py | 6 +- .../test_ordinary_fields.py | 3 +- tests/logging_tests/tests.py | 6 +- tests/mail/tests.py | 9 +- tests/middleware/test_security.py | 3 +- tests/migrations/test_autodetector.py | 12 +- tests/model_fields/test_imagefield.py | 6 +- tests/model_forms/tests.py | 116 +++++++++--------- tests/model_formsets_regress/tests.py | 3 +- tests/model_inheritance_regress/tests.py | 46 +++---- tests/multiple_database/tests.py | 40 +++--- tests/queries/tests.py | 6 +- tests/reverse_lookup/tests.py | 3 +- tests/select_related_onetoone/tests.py | 6 +- tests/sessions_tests/tests.py | 3 +- tests/staticfiles_tests/test_management.py | 3 +- tests/staticfiles_tests/test_storage.py | 3 +- tests/template_tests/test_response.py | 3 +- tests/test_client/tests.py | 3 +- tests/timezones/tests.py | 18 ++- tests/update/tests.py | 3 +- 40 files changed, 266 insertions(+), 232 deletions(-) diff --git a/django/contrib/messages/storage/fallback.py b/django/contrib/messages/storage/fallback.py index 9fbf522bb2..97f82d7654 100644 --- a/django/contrib/messages/storage/fallback.py +++ b/django/contrib/messages/storage/fallback.py @@ -45,8 +45,7 @@ class FallbackStorage(BaseStorage): """ for storage in self.storages: if messages: - messages = storage._store(messages, response, - remove_oldest=False) + messages = storage._store(messages, response, remove_oldest=False) # Even if there are no more messages, continue iterating to ensure # storages which contained messages are flushed. elif storage in self._used_storages: diff --git a/django/core/mail/message.py b/django/core/mail/message.py index b25d23881b..c36fdcff09 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -397,8 +397,7 @@ class EmailMessage: filename.encode('ascii') except UnicodeEncodeError: filename = ('utf-8', '', filename) - attachment.add_header('Content-Disposition', 'attachment', - filename=filename) + attachment.add_header('Content-Disposition', 'attachment', filename=filename) return attachment def _set_list_header_if_not_empty(self, msg, header, values): diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index 1982a8aedb..0c060e57eb 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -263,7 +263,8 @@ class DatabaseWrapper(BaseDatabaseWrapper): nodb_connection = self.__class__( self.settings_dict.copy(), alias=self.alias, - allow_thread_sharing=False) + allow_thread_sharing=False, + ) return nodb_connection @cached_property diff --git a/django/forms/forms.py b/django/forms/forms.py index 86f9399001..51e6465539 100644 --- a/django/forms/forms.py +++ b/django/forms/forms.py @@ -281,7 +281,8 @@ class BaseForm: error_row='%s', row_ender='', help_text_html='
%s', - errors_on_separate_row=False) + errors_on_separate_row=False, + ) def as_ul(self): "Return this form rendered as HTML
  • s -- excluding the ." @@ -290,7 +291,8 @@ class BaseForm: error_row='
  • %s
    • ', row_ender='', help_text_html=' %s', - errors_on_separate_row=False) + errors_on_separate_row=False, + ) def as_p(self): "Return this form rendered as HTML

    s." @@ -299,7 +301,8 @@ class BaseForm: error_row='%s', row_ender='

    ', help_text_html=' %s', - errors_on_separate_row=True) + errors_on_separate_row=True, + ) def non_field_errors(self): """ diff --git a/django/middleware/common.py b/django/middleware/common.py index 2a74774654..bea3f7448a 100644 --- a/django/middleware/common.py +++ b/django/middleware/common.py @@ -130,7 +130,8 @@ class BrokenLinkEmailsMiddleware(MiddlewareMixin): ), "Referrer: %s\nRequested URL: %s\nUser agent: %s\n" "IP address: %s\n" % (referer, path, ua, ip), - fail_silently=True) + fail_silently=True, + ) return response def is_internal_request(self, domain, referer): diff --git a/django/test/runner.py b/django/test/runner.py index 9ed78a6be8..9bd9f2b506 100644 --- a/django/test/runner.py +++ b/django/test/runner.py @@ -356,7 +356,8 @@ class ParallelTestSuite(unittest.TestSuite): pool = multiprocessing.Pool( processes=self.processes, initializer=self.init_worker.__func__, - initargs=[counter]) + initargs=[counter], + ) args = [ (self.runner_class, index, subsuite, self.failfast) for index, subsuite in enumerate(self.subsuites) diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index af11c2ac35..a0cff0837b 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -146,7 +146,8 @@ class DjangoTranslation(gettext_module.GNUTranslations): localedir=localedir, languages=[self.__locale], codeset='utf-8', - fallback=use_null_fallback) + fallback=use_null_fallback, + ) def _init_translation_catalog(self): """Create a base catalog using global django translations.""" diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py index ceae4c11a2..9e6ce63077 100644 --- a/tests/admin_views/admin.py +++ b/tests/admin_views/admin.py @@ -282,8 +282,7 @@ download.short_description = 'Download subscription' def no_perm(modeladmin, request, selected): - return HttpResponse(content='No permission to perform this action', - status=403) + return HttpResponse(content='No permission to perform this action', status=403) no_perm.short_description = 'No permission to run' @@ -685,11 +684,7 @@ class ReportAdmin(admin.ModelAdmin): def get_urls(self): # Corner case: Don't call parent implementation - return [ - url(r'^extra/$', - self.extra, - name='cable_extra'), - ] + return [url(r'^extra/$', self.extra, name='cable_extra')] class CustomTemplateBooleanFieldListFilter(BooleanFieldListFilter): diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py index ee1c50cfdf..d7759c8552 100644 --- a/tests/annotations/tests.py +++ b/tests/annotations/tests.py @@ -283,9 +283,10 @@ class NonAggregateAnnotationTestCase(TestCase): def test_annotation_reverse_m2m(self): books = Book.objects.annotate( - store_name=F('store__name')).filter( - name='Practical Django Projects').order_by( - 'store_name') + store_name=F('store__name'), + ).filter( + name='Practical Django Projects', + ).order_by('store_name') self.assertQuerysetEqual( books, [ @@ -497,7 +498,8 @@ class NonAggregateAnnotationTestCase(TestCase): F('ticker_name'), F('description'), Value('No Tag'), - function='COALESCE') + function='COALESCE', + ) ).annotate( tagline_lower=Lower(F('tagline'), output_field=CharField()) ).order_by('name') diff --git a/tests/auth_tests/test_auth_backends.py b/tests/auth_tests/test_auth_backends.py index 390d26ea9b..1a1950e989 100644 --- a/tests/auth_tests/test_auth_backends.py +++ b/tests/auth_tests/test_auth_backends.py @@ -559,8 +559,8 @@ class ChangedBackendSettingsTest(TestCase): # Get a session for the test user self.assertTrue(self.client.login( username=self.TEST_USERNAME, - password=self.TEST_PASSWORD) - ) + password=self.TEST_PASSWORD, + )) # Prepare a request object request = HttpRequest() request.session = self.client.session diff --git a/tests/check_framework/test_security.py b/tests/check_framework/test_security.py index cfc90f95e9..e6fe1f6cb7 100644 --- a/tests/check_framework/test_security.py +++ b/tests/check_framework/test_security.py @@ -13,7 +13,8 @@ class CheckSessionCookieSecureTest(SimpleTestCase): @override_settings( SESSION_COOKIE_SECURE=False, INSTALLED_APPS=["django.contrib.sessions"], - MIDDLEWARE=[]) + MIDDLEWARE=[], + ) def test_session_cookie_secure_with_installed_app(self): """ Warn if SESSION_COOKIE_SECURE is off and "django.contrib.sessions" is @@ -24,7 +25,8 @@ class CheckSessionCookieSecureTest(SimpleTestCase): @override_settings( SESSION_COOKIE_SECURE=False, INSTALLED_APPS=[], - MIDDLEWARE=["django.contrib.sessions.middleware.SessionMiddleware"]) + MIDDLEWARE=['django.contrib.sessions.middleware.SessionMiddleware'], + ) def test_session_cookie_secure_with_middleware(self): """ Warn if SESSION_COOKIE_SECURE is off and @@ -36,7 +38,8 @@ class CheckSessionCookieSecureTest(SimpleTestCase): @override_settings( SESSION_COOKIE_SECURE=False, INSTALLED_APPS=["django.contrib.sessions"], - MIDDLEWARE=["django.contrib.sessions.middleware.SessionMiddleware"]) + MIDDLEWARE=['django.contrib.sessions.middleware.SessionMiddleware'], + ) def test_session_cookie_secure_both(self): """ If SESSION_COOKIE_SECURE is off and we find both the session app and @@ -47,7 +50,8 @@ class CheckSessionCookieSecureTest(SimpleTestCase): @override_settings( SESSION_COOKIE_SECURE=True, INSTALLED_APPS=["django.contrib.sessions"], - MIDDLEWARE=["django.contrib.sessions.middleware.SessionMiddleware"]) + MIDDLEWARE=['django.contrib.sessions.middleware.SessionMiddleware'], + ) def test_session_cookie_secure_true(self): """ If SESSION_COOKIE_SECURE is on, there's no warning about it. @@ -64,7 +68,8 @@ class CheckSessionCookieHttpOnlyTest(SimpleTestCase): @override_settings( SESSION_COOKIE_HTTPONLY=False, INSTALLED_APPS=["django.contrib.sessions"], - MIDDLEWARE=[]) + MIDDLEWARE=[], + ) def test_session_cookie_httponly_with_installed_app(self): """ Warn if SESSION_COOKIE_HTTPONLY is off and "django.contrib.sessions" @@ -75,7 +80,8 @@ class CheckSessionCookieHttpOnlyTest(SimpleTestCase): @override_settings( SESSION_COOKIE_HTTPONLY=False, INSTALLED_APPS=[], - MIDDLEWARE=["django.contrib.sessions.middleware.SessionMiddleware"]) + MIDDLEWARE=['django.contrib.sessions.middleware.SessionMiddleware'], + ) def test_session_cookie_httponly_with_middleware(self): """ Warn if SESSION_COOKIE_HTTPONLY is off and @@ -87,7 +93,8 @@ class CheckSessionCookieHttpOnlyTest(SimpleTestCase): @override_settings( SESSION_COOKIE_HTTPONLY=False, INSTALLED_APPS=["django.contrib.sessions"], - MIDDLEWARE=["django.contrib.sessions.middleware.SessionMiddleware"]) + MIDDLEWARE=['django.contrib.sessions.middleware.SessionMiddleware'], + ) def test_session_cookie_httponly_both(self): """ If SESSION_COOKIE_HTTPONLY is off and we find both the session app and @@ -98,7 +105,8 @@ class CheckSessionCookieHttpOnlyTest(SimpleTestCase): @override_settings( SESSION_COOKIE_HTTPONLY=True, INSTALLED_APPS=["django.contrib.sessions"], - MIDDLEWARE=["django.contrib.sessions.middleware.SessionMiddleware"]) + MIDDLEWARE=['django.contrib.sessions.middleware.SessionMiddleware'], + ) def test_session_cookie_httponly_true(self): """ If SESSION_COOKIE_HTTPONLY is on, there's no warning about it. @@ -119,8 +127,7 @@ class CheckCSRFMiddlewareTest(SimpleTestCase): """ self.assertEqual(self.func(None), [csrf.W003]) - @override_settings( - MIDDLEWARE=["django.middleware.csrf.CsrfViewMiddleware"]) + @override_settings(MIDDLEWARE=['django.middleware.csrf.CsrfViewMiddleware']) def test_with_csrf_middleware(self): self.assertEqual(self.func(None), []) @@ -133,7 +140,8 @@ class CheckCSRFCookieSecureTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.csrf.CsrfViewMiddleware"], - CSRF_COOKIE_SECURE=False) + CSRF_COOKIE_SECURE=False, + ) def test_with_csrf_cookie_secure_false(self): """ Warn if CsrfViewMiddleware is in MIDDLEWARE but @@ -144,7 +152,8 @@ class CheckCSRFCookieSecureTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.csrf.CsrfViewMiddleware"], CSRF_USE_SESSIONS=True, - CSRF_COOKIE_SECURE=False) + CSRF_COOKIE_SECURE=False, + ) def test_use_sessions_with_csrf_cookie_secure_false(self): """ No warning if CSRF_COOKIE_SECURE isn't True while CSRF_USE_SESSIONS @@ -162,7 +171,8 @@ class CheckCSRFCookieSecureTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.csrf.CsrfViewMiddleware"], - CSRF_COOKIE_SECURE=True) + CSRF_COOKIE_SECURE=True, + ) def test_with_csrf_cookie_secure_true(self): self.assertEqual(self.func(None), []) @@ -180,8 +190,7 @@ class CheckSecurityMiddlewareTest(SimpleTestCase): """ self.assertEqual(self.func(None), [base.W001]) - @override_settings( - MIDDLEWARE=["django.middleware.security.SecurityMiddleware"]) + @override_settings(MIDDLEWARE=['django.middleware.security.SecurityMiddleware']) def test_with_security_middleware(self): self.assertEqual(self.func(None), []) @@ -194,16 +203,15 @@ class CheckStrictTransportSecurityTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], - SECURE_HSTS_SECONDS=0) + SECURE_HSTS_SECONDS=0, + ) def test_no_sts(self): """ Warn if SECURE_HSTS_SECONDS isn't > 0. """ self.assertEqual(self.func(None), [base.W004]) - @override_settings( - MIDDLEWARE=[], - SECURE_HSTS_SECONDS=0) + @override_settings(MIDDLEWARE=[], SECURE_HSTS_SECONDS=0) def test_no_sts_no_middleware(self): """ Don't warn if SECURE_HSTS_SECONDS isn't > 0 and SecurityMiddleware isn't @@ -213,7 +221,8 @@ class CheckStrictTransportSecurityTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], - SECURE_HSTS_SECONDS=3600) + SECURE_HSTS_SECONDS=3600, + ) def test_with_sts(self): self.assertEqual(self.func(None), []) @@ -227,7 +236,8 @@ class CheckStrictTransportSecuritySubdomainsTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], SECURE_HSTS_INCLUDE_SUBDOMAINS=False, - SECURE_HSTS_SECONDS=3600) + SECURE_HSTS_SECONDS=3600, + ) def test_no_sts_subdomains(self): """ Warn if SECURE_HSTS_INCLUDE_SUBDOMAINS isn't True. @@ -237,7 +247,8 @@ class CheckStrictTransportSecuritySubdomainsTest(SimpleTestCase): @override_settings( MIDDLEWARE=[], SECURE_HSTS_INCLUDE_SUBDOMAINS=False, - SECURE_HSTS_SECONDS=3600) + SECURE_HSTS_SECONDS=3600, + ) def test_no_sts_subdomains_no_middleware(self): """ Don't warn if SecurityMiddleware isn't installed. @@ -247,7 +258,8 @@ class CheckStrictTransportSecuritySubdomainsTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], SECURE_SSL_REDIRECT=False, - SECURE_HSTS_SECONDS=None) + SECURE_HSTS_SECONDS=None, + ) def test_no_sts_subdomains_no_seconds(self): """ Don't warn if SECURE_HSTS_SECONDS isn't set. @@ -257,7 +269,8 @@ class CheckStrictTransportSecuritySubdomainsTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], SECURE_HSTS_INCLUDE_SUBDOMAINS=True, - SECURE_HSTS_SECONDS=3600) + SECURE_HSTS_SECONDS=3600, + ) def test_with_sts_subdomains(self): self.assertEqual(self.func(None), []) @@ -365,16 +378,15 @@ class CheckContentTypeNosniffTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], - SECURE_CONTENT_TYPE_NOSNIFF=False) + SECURE_CONTENT_TYPE_NOSNIFF=False, + ) def test_no_content_type_nosniff(self): """ Warn if SECURE_CONTENT_TYPE_NOSNIFF isn't True. """ self.assertEqual(self.func(None), [base.W006]) - @override_settings( - MIDDLEWARE=[], - SECURE_CONTENT_TYPE_NOSNIFF=False) + @override_settings(MIDDLEWARE=[], SECURE_CONTENT_TYPE_NOSNIFF=False) def test_no_content_type_nosniff_no_middleware(self): """ Don't warn if SECURE_CONTENT_TYPE_NOSNIFF isn't True and @@ -384,7 +396,8 @@ class CheckContentTypeNosniffTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], - SECURE_CONTENT_TYPE_NOSNIFF=True) + SECURE_CONTENT_TYPE_NOSNIFF=True, + ) def test_with_content_type_nosniff(self): self.assertEqual(self.func(None), []) @@ -397,16 +410,15 @@ class CheckXssFilterTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], - SECURE_BROWSER_XSS_FILTER=False) + SECURE_BROWSER_XSS_FILTER=False, + ) def test_no_xss_filter(self): """ Warn if SECURE_BROWSER_XSS_FILTER isn't True. """ self.assertEqual(self.func(None), [base.W007]) - @override_settings( - MIDDLEWARE=[], - SECURE_BROWSER_XSS_FILTER=False) + @override_settings(MIDDLEWARE=[], SECURE_BROWSER_XSS_FILTER=False) def test_no_xss_filter_no_middleware(self): """ Don't warn if SECURE_BROWSER_XSS_FILTER isn't True and @@ -416,7 +428,8 @@ class CheckXssFilterTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], - SECURE_BROWSER_XSS_FILTER=True) + SECURE_BROWSER_XSS_FILTER=True, + ) def test_with_xss_filter(self): self.assertEqual(self.func(None), []) @@ -429,16 +442,15 @@ class CheckSSLRedirectTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], - SECURE_SSL_REDIRECT=False) + SECURE_SSL_REDIRECT=False, + ) def test_no_ssl_redirect(self): """ Warn if SECURE_SSL_REDIRECT isn't True. """ self.assertEqual(self.func(None), [base.W008]) - @override_settings( - MIDDLEWARE=[], - SECURE_SSL_REDIRECT=False) + @override_settings(MIDDLEWARE=[], SECURE_SSL_REDIRECT=False) def test_no_ssl_redirect_no_middleware(self): """ Don't warn if SECURE_SSL_REDIRECT is False and SecurityMiddleware isn't @@ -448,7 +460,8 @@ class CheckSSLRedirectTest(SimpleTestCase): @override_settings( MIDDLEWARE=["django.middleware.security.SecurityMiddleware"], - SECURE_SSL_REDIRECT=True) + SECURE_SSL_REDIRECT=True, + ) def test_with_ssl_redirect(self): self.assertEqual(self.func(None), []) diff --git a/tests/defer/tests.py b/tests/defer/tests.py index a3ef1c58b1..dbb1299255 100644 --- a/tests/defer/tests.py +++ b/tests/defer/tests.py @@ -233,8 +233,7 @@ class TestDefer2(AssertionMixin, TestCase): fetched parent model PK if it happens to be available. """ s1 = Secondary.objects.create(first="x1", second="y1") - bc = BigChild.objects.create(name="b1", value="foo", related=s1, - other="bar") + bc = BigChild.objects.create(name='b1', value='foo', related=s1, other='bar') bc_deferred = BigChild.objects.only('name').get(pk=bc.pk) with self.assertNumQueries(0): bc_deferred.id diff --git a/tests/delete_regress/tests.py b/tests/delete_regress/tests.py index a8b1cb0386..d4d39843e3 100644 --- a/tests/delete_regress/tests.py +++ b/tests/delete_regress/tests.py @@ -61,8 +61,7 @@ class DeleteCascadeTests(TestCase): """ person = Person.objects.create(name='Nelson Mandela') award = Award.objects.create(name='Nobel', content_object=person) - AwardNote.objects.create(note='a peace prize', - award=award) + AwardNote.objects.create(note='a peace prize', award=award) self.assertEqual(AwardNote.objects.count(), 1) person.delete() self.assertEqual(Award.objects.count(), 0) @@ -78,10 +77,8 @@ class DeleteCascadeTests(TestCase): """ juan = Child.objects.create(name='Juan') paints = Toy.objects.create(name='Paints') - played = PlayedWith.objects.create(child=juan, toy=paints, - date=datetime.date.today()) - PlayedWithNote.objects.create(played=played, - note='the next Jackson Pollock') + played = PlayedWith.objects.create(child=juan, toy=paints, date=datetime.date.today()) + PlayedWithNote.objects.create(played=played, note='the next Jackson Pollock') self.assertEqual(PlayedWithNote.objects.count(), 1) paints.delete() self.assertEqual(PlayedWith.objects.count(), 0) diff --git a/tests/expressions/models.py b/tests/expressions/models.py index 34fd9dff16..42e4a37bb0 100644 --- a/tests/expressions/models.py +++ b/tests/expressions/models.py @@ -22,12 +22,14 @@ class Company(models.Model): ceo = models.ForeignKey( Employee, models.CASCADE, - related_name='company_ceo_set') + related_name='company_ceo_set', + ) point_of_contact = models.ForeignKey( Employee, models.SET_NULL, related_name='company_point_of_contact_set', - null=True) + null=True, + ) def __str__(self): return self.name diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index 7453838839..b57a16c35f 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -373,7 +373,8 @@ class BasicExpressionsTests(TestCase): # other lookups could not reuse. qs = Employee.objects.filter( company_ceo_set__num_chairs=F('company_ceo_set__num_employees'), - company_ceo_set__num_chairs__gte=1) + company_ceo_set__num_chairs__gte=1, + ) self.assertEqual(str(qs.query).count('JOIN'), 1) def test_ticket_18375_kwarg_ordering_2(self): @@ -793,17 +794,20 @@ class ExpressionsTests(TestCase): self.assertQuerysetEqual( Employee.objects.filter(firstname__contains=F('lastname')), ["", "", ""], - ordered=False) + ordered=False, + ) self.assertQuerysetEqual( Employee.objects.filter(firstname__startswith=F('lastname')), ["", ""], - ordered=False) + ordered=False, + ) self.assertQuerysetEqual( Employee.objects.filter(firstname__endswith=F('lastname')), [""], - ordered=False) + ordered=False, + ) def test_insensitive_patterns_escape(self): r""" @@ -825,17 +829,20 @@ class ExpressionsTests(TestCase): self.assertQuerysetEqual( Employee.objects.filter(firstname__icontains=F('lastname')), ["", "", ""], - ordered=False) + ordered=False, + ) self.assertQuerysetEqual( Employee.objects.filter(firstname__istartswith=F('lastname')), ["", ""], - ordered=False) + ordered=False, + ) self.assertQuerysetEqual( Employee.objects.filter(firstname__iendswith=F('lastname')), [""], - ordered=False) + ordered=False, + ) class ExpressionsNumericTests(TestCase): diff --git a/tests/fixtures/tests.py b/tests/fixtures/tests.py index f5df67a55b..a27ad6183d 100644 --- a/tests/fixtures/tests.py +++ b/tests/fixtures/tests.py @@ -334,7 +334,8 @@ class FixtureLoadingTests(DumpDataAssertMixin, TestCase): self._dumpdata_assert( ['sites', 'fixtures'], '[{"pk": 1, "model": "sites.site", "fields": {"domain": "example.com", "name": "example.com"}}]', - exclude_list=['fixtures']) + exclude_list=['fixtures'], + ) # Excluding fixtures.Article/Book should leave fixtures.Category self._dumpdata_assert( diff --git a/tests/foreign_object/models/person.py b/tests/foreign_object/models/person.py index a41d9d96d9..cd04d1eeda 100644 --- a/tests/foreign_object/models/person.py +++ b/tests/foreign_object/models/person.py @@ -88,7 +88,8 @@ class Friendship(models.Model): on_delete=models.CASCADE, from_fields=['from_friend_country', 'from_friend_id'], to_fields=['person_country_id', 'id'], - related_name='from_friend') + related_name='from_friend', + ) to_friend_country = models.ForeignObject( Country, diff --git a/tests/forms_tests/models.py b/tests/forms_tests/models.py index 327fd7802c..23cabc2d84 100644 --- a/tests/forms_tests/models.py +++ b/tests/forms_tests/models.py @@ -50,8 +50,7 @@ class ChoiceModel(models.Model): choice = models.CharField(max_length=2, blank=True, choices=CHOICES) choice_string_w_none = models.CharField( max_length=2, blank=True, null=True, choices=STRING_CHOICES_WITH_NONE) - choice_integer = models.IntegerField(choices=INTEGER_CHOICES, blank=True, - null=True) + choice_integer = models.IntegerField(choices=INTEGER_CHOICES, blank=True, null=True) class ChoiceOptionModel(models.Model): diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py index b326468d69..f603a95a17 100644 --- a/tests/forms_tests/tests/test_forms.py +++ b/tests/forms_tests/tests/test_forms.py @@ -3240,9 +3240,11 @@ Good luck picking a username that doesn't already exist.

    bar = CharField() def clean(self): - raise ValidationError('

    Non-field error.

    ', - code='secret', - params={'a': 1, 'b': 2}) + raise ValidationError( + '

    Non-field error.

    ', + code='secret', + params={'a': 1, 'b': 2}, + ) control = { 'foo': [{'code': 'required', 'message': 'This field is required.'}], diff --git a/tests/i18n/test_extraction.py b/tests/i18n/test_extraction.py index fc8eaa2b8f..b4c2ce4c9d 100644 --- a/tests/i18n/test_extraction.py +++ b/tests/i18n/test_extraction.py @@ -629,13 +629,11 @@ class KeepPotFileExtractorTests(ExtractorTests): self.assertFalse(os.path.exists(self.POT_FILE)) def test_keep_pot_explicitly_disabled(self): - management.call_command('makemessages', locale=[LOCALE], verbosity=0, - keep_pot=False) + management.call_command('makemessages', locale=[LOCALE], verbosity=0, keep_pot=False) self.assertFalse(os.path.exists(self.POT_FILE)) def test_keep_pot_enabled(self): - management.call_command('makemessages', locale=[LOCALE], verbosity=0, - keep_pot=True) + management.call_command('makemessages', locale=[LOCALE], verbosity=0, keep_pot=True) self.assertTrue(os.path.exists(self.POT_FILE)) diff --git a/tests/invalid_models_tests/test_ordinary_fields.py b/tests/invalid_models_tests/test_ordinary_fields.py index 281779828d..a3c3a70808 100644 --- a/tests/invalid_models_tests/test_ordinary_fields.py +++ b/tests/invalid_models_tests/test_ordinary_fields.py @@ -67,7 +67,8 @@ class CharFieldTests(TestCase): ('1', 'item1'), ('2', 'item2'), ], - db_index=True) + db_index=True, + ) field = Model._meta.get_field('field') self.assertEqual(field.check(), []) diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py index 8b2b093339..0330fdccf5 100644 --- a/tests/logging_tests/tests.py +++ b/tests/logging_tests/tests.py @@ -390,8 +390,10 @@ class SetupConfigureLogging(SimpleTestCase): """ Calling django.setup() initializes the logging configuration. """ - @override_settings(LOGGING_CONFIG='logging_tests.tests.dictConfig', - LOGGING=OLD_LOGGING) + @override_settings( + LOGGING_CONFIG='logging_tests.tests.dictConfig', + LOGGING=OLD_LOGGING, + ) def test_configure_initializes_logging(self): from django import setup setup() diff --git a/tests/mail/tests.py b/tests/mail/tests.py index b8d0089ee3..77e1378192 100644 --- a/tests/mail/tests.py +++ b/tests/mail/tests.py @@ -1300,7 +1300,8 @@ class SMTPBackendTests(BaseEmailBackendTests, SMTPBackendTestsBase): @override_settings( EMAIL_HOST_USER="not empty username", - EMAIL_HOST_PASSWORD="not empty password") + EMAIL_HOST_PASSWORD='not empty password', + ) def test_email_authentication_use_settings(self): backend = smtp.EmailBackend() self.assertEqual(backend.username, 'not empty username') @@ -1308,7 +1309,8 @@ class SMTPBackendTests(BaseEmailBackendTests, SMTPBackendTestsBase): @override_settings( EMAIL_HOST_USER="not empty username", - EMAIL_HOST_PASSWORD="not empty password") + EMAIL_HOST_PASSWORD='not empty password', + ) def test_email_authentication_override_settings(self): backend = smtp.EmailBackend(username='username', password='password') self.assertEqual(backend.username, 'username') @@ -1316,7 +1318,8 @@ class SMTPBackendTests(BaseEmailBackendTests, SMTPBackendTestsBase): @override_settings( EMAIL_HOST_USER="not empty username", - EMAIL_HOST_PASSWORD="not empty password") + EMAIL_HOST_PASSWORD='not empty password', + ) def test_email_disabled_authentication(self): backend = smtp.EmailBackend(username='', password='') self.assertEqual(backend.username, '') diff --git a/tests/middleware/test_security.py b/tests/middleware/test_security.py index 31a3dbb74c..eaefb22ee4 100644 --- a/tests/middleware/test_security.py +++ b/tests/middleware/test_security.py @@ -48,7 +48,8 @@ class SecurityMiddlewareTest(SimpleTestCase): """ self.assertEqual( self.process_response(secure=True)["strict-transport-security"], - "max-age=3600") + 'max-age=3600', + ) @override_settings(SECURE_HSTS_SECONDS=3600) def test_sts_already_present(self): diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py index 43c3a1941a..e262a8ee52 100644 --- a/tests/migrations/test_autodetector.py +++ b/tests/migrations/test_autodetector.py @@ -783,8 +783,10 @@ class AutodetectorTests(TestCase): self.assertOperationAttributes(changes, "testapp", 0, 0, name="name", preserve_default=True) self.assertOperationFieldAttributes(changes, "testapp", 0, 0, default='Ada Lovelace') - @mock.patch('django.db.migrations.questioner.MigrationQuestioner.ask_not_null_alteration', - return_value=models.NOT_PROVIDED) + @mock.patch( + 'django.db.migrations.questioner.MigrationQuestioner.ask_not_null_alteration', + return_value=models.NOT_PROVIDED, + ) def test_alter_field_to_not_null_without_default(self, mocked_ask_method): """ #23609 - Tests autodetection of nullable to non-nullable alterations. @@ -797,8 +799,10 @@ class AutodetectorTests(TestCase): self.assertOperationAttributes(changes, "testapp", 0, 0, name="name", preserve_default=True) self.assertOperationFieldAttributes(changes, "testapp", 0, 0, default=models.NOT_PROVIDED) - @mock.patch('django.db.migrations.questioner.MigrationQuestioner.ask_not_null_alteration', - return_value='Some Name') + @mock.patch( + 'django.db.migrations.questioner.MigrationQuestioner.ask_not_null_alteration', + return_value='Some Name', + ) def test_alter_field_to_not_null_oneoff_default(self, mocked_ask_method): """ #23609 - Tests autodetection of nullable to non-nullable alterations. diff --git a/tests/model_fields/test_imagefield.py b/tests/model_fields/test_imagefield.py index 50af786f5a..8fb64be464 100644 --- a/tests/model_fields/test_imagefield.py +++ b/tests/model_fields/test_imagefield.py @@ -64,8 +64,7 @@ class ImageFieldTestMixin(SerializeMixin): self.file2.close() shutil.rmtree(temp_storage_dir) - def check_dimensions(self, instance, width, height, - field_name='mugshot'): + def check_dimensions(self, instance, width, height, field_name='mugshot'): """ Asserts that the given width and height values match both the field's height and width attributes and the height and width fields @@ -363,8 +362,7 @@ class TwoImageFieldTests(ImageFieldTestMixin, TestCase): self.check_dimensions(p, 8, 4, 'headshot') def test_create(self): - p = self.PersonModel.objects.create(mugshot=self.file1, - headshot=self.file2) + p = self.PersonModel.objects.create(mugshot=self.file1, headshot=self.file2) self.check_dimensions(p, 4, 8) self.check_dimensions(p, 8, 4, 'headshot') diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index e3c347aee6..9bbb51aef4 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -173,8 +173,7 @@ class CustomErrorMessageForm(forms.ModelForm): class ModelFormBaseTest(TestCase): def test_base_form(self): - self.assertEqual(list(BaseCategoryForm.base_fields), - ['name', 'slug', 'url']) + self.assertEqual(list(BaseCategoryForm.base_fields), ['name', 'slug', 'url']) def test_no_model_class(self): class NoModelModelForm(forms.ModelForm): @@ -224,8 +223,7 @@ class ModelFormBaseTest(TestCase): super().__init__(*args, **kwargs) self.fields['character'].required = False - char = Character.objects.create(username='user', - last_action=datetime.datetime.today()) + char = Character.objects.create(username='user', last_action=datetime.datetime.today()) data = {'study': 'Engineering'} data2 = {'study': 'Engineering', 'character': char.pk} @@ -514,8 +512,7 @@ class ModelFormBaseTest(TestCase): """ pass - self.assertEqual(list(SubCategoryForm.base_fields), - ['name', 'slug', 'url']) + self.assertEqual(list(SubCategoryForm.base_fields), ['name', 'slug', 'url']) def test_subclassmeta_form(self): class SomeCategoryForm(forms.ModelForm): @@ -565,8 +562,7 @@ class ModelFormBaseTest(TestCase): fields = ['slug', 'url', 'name'] exclude = ['url'] - self.assertEqual(list(OrderFields2.base_fields), - ['slug', 'name']) + self.assertEqual(list(OrderFields2.base_fields), ['slug', 'name']) def test_default_populated_on_optional_field(self): class PubForm(forms.ModelForm): @@ -934,8 +930,10 @@ class UniqueTest(TestCase): }) self.assertFalse(form.is_valid()) self.assertEqual(len(form.errors), 1) - self.assertEqual(form.errors['__all__'], - ['Derived book with this Suffix1 and Suffix2 already exists.']) + self.assertEqual( + form.errors['__all__'], + ['Derived book with this Suffix1 and Suffix2 already exists.'], + ) def test_explicitpk_unspecified(self): """Test for primary_key being in the form and failing validation.""" @@ -1107,12 +1105,9 @@ class UniqueTest(TestCase): class ModelFormBasicTests(TestCase): def create_basic_data(self): - self.c1 = Category.objects.create( - name="Entertainment", slug="entertainment", url="entertainment") - self.c2 = Category.objects.create( - name="It's a test", slug="its-test", url="test") - self.c3 = Category.objects.create( - name="Third test", slug="third-test", url="third") + self.c1 = Category.objects.create(name='Entertainment', slug='entertainment', url='entertainment') + self.c2 = Category.objects.create(name="It's a test", slug='its-test', url='test') + self.c3 = Category.objects.create(name='Third test', slug='third-test', url='third') self.w_royko = Writer.objects.create(name='Mike Royko') self.w_woodward = Writer.objects.create(name='Bob Woodward') @@ -1249,8 +1244,11 @@ class ModelFormBasicTests(TestCase): return db_field.formfield(**kwargs) # Create a ModelForm, instantiate it, and check that the output is as expected - ModelForm = modelform_factory(Article, fields=['headline', 'categories'], - formfield_callback=formfield_for_dbfield) + ModelForm = modelform_factory( + Article, + fields=['headline', 'categories'], + formfield_callback=formfield_for_dbfield, + ) form = ModelForm() self.assertHTMLEqual( form.as_ul(), @@ -1558,12 +1556,9 @@ class ModelFormBasicTests(TestCase): class ModelMultipleChoiceFieldTests(TestCase): def setUp(self): - self.c1 = Category.objects.create( - name="Entertainment", slug="entertainment", url="entertainment") - self.c2 = Category.objects.create( - name="It's a test", slug="its-test", url="test") - self.c3 = Category.objects.create( - name="Third", slug="third-test", url="third") + self.c1 = Category.objects.create(name='Entertainment', slug='entertainment', url='entertainment') + self.c2 = Category.objects.create(name="It's a test", slug='its-test', url='test') + self.c3 = Category.objects.create(name='Third', slug='third-test', url='third') def test_model_multiple_choice_field(self): f = forms.ModelMultipleChoiceField(Category.objects.all()) @@ -1669,9 +1664,7 @@ class ModelMultipleChoiceFieldTests(TestCase): def my_validator(value): self._validator_run = True - f = forms.ModelMultipleChoiceField(queryset=Writer.objects.all(), - validators=[my_validator]) - + f = forms.ModelMultipleChoiceField(queryset=Writer.objects.all(), validators=[my_validator]) f.clean([p.pk for p in Writer.objects.all()[8:9]]) self.assertTrue(self._validator_run) @@ -1680,8 +1673,7 @@ class ModelMultipleChoiceFieldTests(TestCase): Test support of show_hidden_initial by ModelMultipleChoiceField. """ class WriterForm(forms.Form): - persons = forms.ModelMultipleChoiceField(show_hidden_initial=True, - queryset=Writer.objects.all()) + persons = forms.ModelMultipleChoiceField(show_hidden_initial=True, queryset=Writer.objects.all()) person1 = Writer.objects.create(name="Person 1") person2 = Writer.objects.create(name="Person 2") @@ -1777,8 +1769,7 @@ class ModelOneToOneFieldTests(TestCase): fields = '__all__' bw = BetterWriter.objects.create(name='Joe Better', score=10) - self.assertEqual(sorted(model_to_dict(bw)), - ['id', 'name', 'score', 'writer_ptr']) + self.assertEqual(sorted(model_to_dict(bw)), ['id', 'name', 'score', 'writer_ptr']) form = BetterWriterForm({'name': 'Some Name', 'score': 12}) self.assertTrue(form.is_valid()) @@ -1918,9 +1909,11 @@ class FileAndImageFieldTests(TestCase): form = DocumentForm(files={'myfile': SimpleUploadedFile('something.txt', b'content')}) self.assertTrue(form.is_valid()) doc = form.save(commit=False) - form = DocumentForm(instance=doc, - files={'myfile': SimpleUploadedFile('something.txt', b'content')}, - data={'myfile-clear': 'true'}) + form = DocumentForm( + instance=doc, + files={'myfile': SimpleUploadedFile('something.txt', b'content')}, + data={'myfile-clear': 'true'}, + ) self.assertTrue(not form.is_valid()) self.assertEqual(form.errors['myfile'], ['Please either submit a file or check the clear checkbox, not both.']) @@ -1951,7 +1944,8 @@ class FileAndImageFieldTests(TestCase): # Upload a file and ensure it all works as expected. f = TextFileForm( data={'description': 'Assistance'}, - files={'file': SimpleUploadedFile('test1.txt', b'hello world')}) + files={'file': SimpleUploadedFile('test1.txt', b'hello world')}, + ) self.assertTrue(f.is_valid()) self.assertEqual(type(f.cleaned_data['file']), SimpleUploadedFile) instance = f.save() @@ -1961,7 +1955,8 @@ class FileAndImageFieldTests(TestCase): # If the previous file has been deleted, the file name can be reused f = TextFileForm( data={'description': 'Assistance'}, - files={'file': SimpleUploadedFile('test1.txt', b'hello world')}) + files={'file': SimpleUploadedFile('test1.txt', b'hello world')}, + ) self.assertTrue(f.is_valid()) self.assertEqual(type(f.cleaned_data['file']), SimpleUploadedFile) instance = f.save() @@ -1970,14 +1965,13 @@ class FileAndImageFieldTests(TestCase): # Check if the max_length attribute has been inherited from the model. f = TextFileForm( data={'description': 'Assistance'}, - files={'file': SimpleUploadedFile('test-maxlength.txt', b'hello world')}) + files={'file': SimpleUploadedFile('test-maxlength.txt', b'hello world')}, + ) self.assertFalse(f.is_valid()) # Edit an instance that already has the file defined in the model. This will not # save the file again, but leave it exactly as it is. - f = TextFileForm( - data={'description': 'Assistance'}, - instance=instance) + f = TextFileForm({'description': 'Assistance'}, instance=instance) self.assertTrue(f.is_valid()) self.assertEqual(f.cleaned_data['file'].name, 'tests/test1.txt') instance = f.save() @@ -1989,7 +1983,9 @@ class FileAndImageFieldTests(TestCase): # Override the file by uploading a new one. f = TextFileForm( data={'description': 'Assistance'}, - files={'file': SimpleUploadedFile('test2.txt', b'hello world')}, instance=instance) + files={'file': SimpleUploadedFile('test2.txt', b'hello world')}, + instance=instance, + ) self.assertTrue(f.is_valid()) instance = f.save() self.assertEqual(instance.file.name, 'tests/test2.txt') @@ -2008,15 +2004,15 @@ class FileAndImageFieldTests(TestCase): f = TextFileForm( data={'description': 'Assistance'}, - files={'file': SimpleUploadedFile('test3.txt', b'hello world')}, instance=instance) + files={'file': SimpleUploadedFile('test3.txt', b'hello world')}, + instance=instance, + ) self.assertTrue(f.is_valid()) instance = f.save() self.assertEqual(instance.file.name, 'tests/test3.txt') # Instance can be edited w/out re-uploading the file and existing file should be preserved. - f = TextFileForm( - data={'description': 'New Description'}, - instance=instance) + f = TextFileForm({'description': 'New Description'}, instance=instance) f.fields['file'].required = False self.assertTrue(f.is_valid()) instance = f.save() @@ -2094,7 +2090,8 @@ class FileAndImageFieldTests(TestCase): f = ImageFileForm( data={'description': 'An image'}, - files={'image': SimpleUploadedFile('test.png', image_data)}) + files={'image': SimpleUploadedFile('test.png', image_data)}, + ) self.assertTrue(f.is_valid()) self.assertEqual(type(f.cleaned_data['image']), SimpleUploadedFile) instance = f.save() @@ -2107,7 +2104,8 @@ class FileAndImageFieldTests(TestCase): instance.image.delete(save=False) f = ImageFileForm( data={'description': 'An image'}, - files={'image': SimpleUploadedFile('test.png', image_data)}) + files={'image': SimpleUploadedFile('test.png', image_data)}, + ) self.assertTrue(f.is_valid()) self.assertEqual(type(f.cleaned_data['image']), SimpleUploadedFile) instance = f.save() @@ -2133,7 +2131,9 @@ class FileAndImageFieldTests(TestCase): f = ImageFileForm( data={'description': 'Changed it'}, - files={'image': SimpleUploadedFile('test2.png', image_data2)}, instance=instance) + files={'image': SimpleUploadedFile('test2.png', image_data2)}, + instance=instance, + ) self.assertTrue(f.is_valid()) instance = f.save() self.assertEqual(instance.image.name, 'tests/test2.png') @@ -2147,7 +2147,8 @@ class FileAndImageFieldTests(TestCase): f = ImageFileForm( data={'description': 'Changed it'}, - files={'image': SimpleUploadedFile('test2.png', image_data2)}) + files={'image': SimpleUploadedFile('test2.png', image_data2)}, + ) self.assertTrue(f.is_valid()) instance = f.save() self.assertEqual(instance.image.name, 'tests/test2.png') @@ -2176,7 +2177,9 @@ class FileAndImageFieldTests(TestCase): f = OptionalImageFileForm( data={'description': 'And a final one'}, - files={'image': SimpleUploadedFile('test3.png', image_data)}, instance=instance) + files={'image': SimpleUploadedFile('test3.png', image_data)}, + instance=instance, + ) self.assertTrue(f.is_valid()) instance = f.save() self.assertEqual(instance.image.name, 'tests/test3.png') @@ -2185,9 +2188,7 @@ class FileAndImageFieldTests(TestCase): # Editing the instance without re-uploading the image should not affect # the image or its width/height properties. - f = OptionalImageFileForm( - data={'description': 'New Description'}, - instance=instance) + f = OptionalImageFileForm({'description': 'New Description'}, instance=instance) self.assertTrue(f.is_valid()) instance = f.save() self.assertEqual(instance.description, 'New Description') @@ -2212,7 +2213,8 @@ class FileAndImageFieldTests(TestCase): # Test callable upload_to behavior that's dependent on the value of another field in the model f = ImageFileForm( data={'description': 'And a final one', 'path': 'foo'}, - files={'image': SimpleUploadedFile('test4.png', image_data)}) + files={'image': SimpleUploadedFile('test4.png', image_data)}, + ) self.assertTrue(f.is_valid()) instance = f.save() self.assertEqual(instance.image.name, 'foo/test4.png') @@ -2378,8 +2380,7 @@ class OtherModelFormTests(TestCase): model = Category fields = ['description', 'url'] - self.assertEqual(list(CategoryForm.base_fields), - ['description', 'url']) + self.assertEqual(list(CategoryForm.base_fields), ['description', 'url']) self.assertHTMLEqual( str(CategoryForm()), @@ -2400,8 +2401,7 @@ class OtherModelFormTests(TestCase): self.assertQuerysetEqual(form.cleaned_data['items'], ['Core', 'Pear']) def test_model_field_that_returns_none_to_exclude_itself_with_explicit_fields(self): - self.assertEqual(list(CustomFieldForExclusionForm.base_fields), - ['name']) + self.assertEqual(list(CustomFieldForExclusionForm.base_fields), ['name']) self.assertHTMLEqual( str(CustomFieldForExclusionForm()), ''' diff --git a/tests/model_formsets_regress/tests.py b/tests/model_formsets_regress/tests.py index ec58a6382a..fb575c2f5e 100644 --- a/tests/model_formsets_regress/tests.py +++ b/tests/model_formsets_regress/tests.py @@ -362,8 +362,7 @@ class FormfieldCallbackTests(TestCase): def test_modelformset_custom_callback(self): callback = Callback() - modelformset_factory(UserSite, form=UserSiteForm, - formfield_callback=callback) + modelformset_factory(UserSite, form=UserSiteForm, formfield_callback=callback) self.assertCallbackCalled(callback) diff --git a/tests/model_inheritance_regress/tests.py b/tests/model_inheritance_regress/tests.py index b8f8ae6d87..b0156ff9ac 100644 --- a/tests/model_inheritance_regress/tests.py +++ b/tests/model_inheritance_regress/tests.py @@ -27,18 +27,15 @@ class ModelInheritanceTest(TestCase): # 'narrow()' API would require a similar approach. # Create a child-parent-grandparent chain - place1 = Place( - name="Guido's House of Pasta", - address='944 W. Fullerton') + place1 = Place(name="Guido's House of Pasta", address='944 W. Fullerton') place1.save_base(raw=True) restaurant = Restaurant( place_ptr=place1, serves_hot_dogs=True, - serves_pizza=False) + serves_pizza=False, + ) restaurant.save_base(raw=True) - italian_restaurant = ItalianRestaurant( - restaurant_ptr=restaurant, - serves_gnocchi=True) + italian_restaurant = ItalianRestaurant(restaurant_ptr=restaurant, serves_gnocchi=True) italian_restaurant.save_base(raw=True) # Create a child-parent chain with an explicit parent link @@ -142,18 +139,15 @@ class ModelInheritanceTest(TestCase): # Regression test for #7276: calling delete() on a model with # multi-table inheritance should delete the associated rows from any # ancestor tables, as well as any descendent objects. - place1 = Place( - name="Guido's House of Pasta", - address='944 W. Fullerton') + place1 = Place(name="Guido's House of Pasta", address='944 W. Fullerton') place1.save_base(raw=True) restaurant = Restaurant( place_ptr=place1, serves_hot_dogs=True, - serves_pizza=False) + serves_pizza=False, + ) restaurant.save_base(raw=True) - italian_restaurant = ItalianRestaurant( - restaurant_ptr=restaurant, - serves_gnocchi=True) + italian_restaurant = ItalianRestaurant(restaurant_ptr=restaurant, serves_gnocchi=True) italian_restaurant.save_base(raw=True) ident = ItalianRestaurant.objects.all()[0].id @@ -162,7 +156,8 @@ class ModelInheritanceTest(TestCase): name='a', address='xx', serves_hot_dogs=True, - serves_pizza=False) + serves_pizza=False, + ) # This should delete both Restaurants, plus the related places, plus # the ItalianRestaurant. @@ -270,18 +265,18 @@ class ModelInheritanceTest(TestCase): article = ArticleWithAuthor.objects.create( author="fred", headline="Hey there!", - pub_date=datetime.datetime(2009, 3, 1, 8, 0, 0)) - update = ArticleWithAuthor.objects.filter( - author="fred").update(headline="Oh, no!") + pub_date=datetime.datetime(2009, 3, 1, 8, 0, 0), + ) + update = ArticleWithAuthor.objects.filter(author='fred').update(headline='Oh, no!') self.assertEqual(update, 1) - update = ArticleWithAuthor.objects.filter( - pk=article.pk).update(headline="Oh, no!") + update = ArticleWithAuthor.objects.filter(pk=article.pk).update(headline='Oh, no!') self.assertEqual(update, 1) derivedm1 = DerivedM.objects.create( customPK=44, base_name="b1", - derived_name="d1") + derived_name='d1', + ) self.assertEqual(derivedm1.customPK, 44) self.assertEqual(derivedm1.base_name, 'b1') self.assertEqual(derivedm1.derived_name, 'd1') @@ -320,7 +315,8 @@ class ModelInheritanceTest(TestCase): headline="Problems in Django", pub_date=datetime.datetime.now(), quality=10, - assignee="adrian") + assignee='adrian', + ) def test_abstract_base_class_m2m_relation_inheritance(self): # many-to-many relations defined on an abstract base class are @@ -330,8 +326,7 @@ class ModelInheritanceTest(TestCase): p3 = Person.objects.create(name='Carol') p4 = Person.objects.create(name='Dave') - birthday = BirthdayParty.objects.create( - name='Birthday party for Alice') + birthday = BirthdayParty.objects.create(name='Birthday party for Alice') birthday.attendees.set([p1, p3]) bachelor = BachelorParty.objects.create(name='Bachelor party for Bob') @@ -351,8 +346,7 @@ class ModelInheritanceTest(TestCase): self.assertFalse(hasattr(p2, 'messybachelorparty_set')) # ... but it does inherit the m2m from its parent - messy = MessyBachelorParty.objects.create( - name='Bachelor party for Dave') + messy = MessyBachelorParty.objects.create(name='Bachelor party for Dave') messy.attendees.set([p4]) messy_parent = messy.bachelorparty_ptr diff --git a/tests/multiple_database/tests.py b/tests/multiple_database/tests.py index ab88ecf875..6dd44f6475 100644 --- a/tests/multiple_database/tests.py +++ b/tests/multiple_database/tests.py @@ -1068,9 +1068,11 @@ class RouterTestCase(TestCase): def test_database_routing(self): marty = Person.objects.using('default').create(name="Marty Alchin") - pro = Book.objects.using('default').create(title="Pro Django", - published=datetime.date(2008, 12, 16), - editor=marty) + pro = Book.objects.using('default').create( + title='Pro Django', + published=datetime.date(2008, 12, 16), + editor=marty, + ) pro.authors.set([marty]) # Create a book and author on the other database @@ -1462,10 +1464,12 @@ class RouterTestCase(TestCase): def test_foreign_key_managers(self): "FK reverse relations are represented by managers, and can be controlled like managers" marty = Person.objects.using('other').create(pk=1, name="Marty Alchin") - Book.objects.using('other').create(pk=1, title="Pro Django", - published=datetime.date(2008, 12, 16), - editor=marty) - + Book.objects.using('other').create( + pk=1, + title='Pro Django', + published=datetime.date(2008, 12, 16), + editor=marty, + ) self.assertEqual(marty.edited.db, 'other') self.assertEqual(marty.edited.db_manager('default').db, 'default') self.assertEqual(marty.edited.db_manager('default').all().db, 'default') @@ -1475,8 +1479,7 @@ class RouterTestCase(TestCase): pro = Book.objects.using('other').create(title="Pro Django", published=datetime.date(2008, 12, 16)) - Review.objects.using('other').create(source="Python Monthly", - content_object=pro) + Review.objects.using('other').create(source='Python Monthly', content_object=pro) self.assertEqual(pro.reviews.db, 'other') self.assertEqual(pro.reviews.db_manager('default').db, 'default') @@ -1487,9 +1490,11 @@ class RouterTestCase(TestCase): # Create a book and author on the other database mark = Person.objects.using('other').create(name="Mark Pilgrim") - Book.objects.using('other').create(title="Dive into Python", - published=datetime.date(2009, 5, 4), - editor=mark) + Book.objects.using('other').create( + title='Dive into Python', + published=datetime.date(2009, 5, 4), + editor=mark, + ) sub = Person.objects.filter(name='Mark Pilgrim') qs = Book.objects.filter(editor__in=sub) @@ -1505,9 +1510,11 @@ class RouterTestCase(TestCase): def test_deferred_models(self): mark_def = Person.objects.using('default').create(name="Mark Pilgrim") mark_other = Person.objects.using('other').create(name="Mark Pilgrim") - orig_b = Book.objects.using('other').create(title="Dive into Python", - published=datetime.date(2009, 5, 4), - editor=mark_other) + orig_b = Book.objects.using('other').create( + title='Dive into Python', + published=datetime.date(2009, 5, 4), + editor=mark_other, + ) b = Book.objects.using('other').only('title').get(pk=orig_b.pk) self.assertEqual(b.published, datetime.date(2009, 5, 4)) b = Book.objects.using('other').only('title').get(pk=orig_b.pk) @@ -1706,8 +1713,7 @@ class SignalTests(TestCase): # Create a copy of the models on the 'other' database to prevent # integrity errors on backends that don't defer constraints checks - Book.objects.using('other').create(pk=b.pk, title=b.title, - published=b.published) + Book.objects.using('other').create(pk=b.pk, title=b.title, published=b.published) Person.objects.using('other').create(pk=p.pk, name=p.name) # Test addition diff --git a/tests/queries/tests.py b/tests/queries/tests.py index d0bf13413c..ea55cfc76e 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -2235,7 +2235,8 @@ class ValuesQuerysetTests(TestCase): # testing for ticket 14930 issues qs = Number.objects.extra( select={'value_plus_one': 'num+1', 'value_minus_one': 'num-1'}, - order_by=['value_minus_one']) + order_by=['value_minus_one'], + ) qs = qs.values('num') def test_extra_select_params_values_order_in_extra(self): @@ -2243,7 +2244,8 @@ class ValuesQuerysetTests(TestCase): qs = Number.objects.extra( select={'value_plus_x': 'num+%s'}, select_params=[1], - order_by=['value_plus_x']) + order_by=['value_plus_x'], + ) qs = qs.filter(num=72) qs = qs.values('num') self.assertSequenceEqual(qs, [{'num': 72}]) diff --git a/tests/reverse_lookup/tests.py b/tests/reverse_lookup/tests.py index b73b23e932..ece30a2a1b 100644 --- a/tests/reverse_lookup/tests.py +++ b/tests/reverse_lookup/tests.py @@ -38,8 +38,7 @@ class ReverseLookupTests(TestCase): p1 = Poll.objects.get(poll_choice__name__exact="This is the answer.") self.assertEqual(p1.question, "What's the first question?") - p2 = Poll.objects.get( - related_choice__name__exact="This is the answer.") + p2 = Poll.objects.get(related_choice__name__exact='This is the answer.') self.assertEqual(p2.question, "What's the second question?") def test_reverse_field_name_disallowed(self): diff --git a/tests/select_related_onetoone/tests.py b/tests/select_related_onetoone/tests.py index 992de98217..0438257a0d 100644 --- a/tests/select_related_onetoone/tests.py +++ b/tests/select_related_onetoone/tests.py @@ -14,14 +14,12 @@ class ReverseSelectRelatedTestCase(TestCase): user = User.objects.create(username="test") UserProfile.objects.create(user=user, state="KS", city="Lawrence") results = UserStatResult.objects.create(results='first results') - userstat = UserStat.objects.create(user=user, posts=150, - results=results) + userstat = UserStat.objects.create(user=user, posts=150, results=results) StatDetails.objects.create(base_stats=userstat, comments=259) user2 = User.objects.create(username="bob") results2 = UserStatResult.objects.create(results='moar results') - advstat = AdvancedUserStat.objects.create(user=user2, posts=200, karma=5, - results=results2) + advstat = AdvancedUserStat.objects.create(user=user2, posts=200, karma=5, results=results2) StatDetails.objects.create(base_stats=advstat, comments=250) p1 = Parent1(name1="Only Parent1") p1.save() diff --git a/tests/sessions_tests/tests.py b/tests/sessions_tests/tests.py index f70c8ca1e6..8f3f948f9e 100644 --- a/tests/sessions_tests/tests.py +++ b/tests/sessions_tests/tests.py @@ -523,7 +523,8 @@ class FileSessionTests(SessionTestsMixin, unittest.TestCase): shutil.rmtree(self.temp_session_store) @override_settings( - SESSION_FILE_PATH="/if/this/directory/exists/you/have/a/weird/computer") + SESSION_FILE_PATH='/if/this/directory/exists/you/have/a/weird/computer', + ) def test_configuration_check(self): del self.backend._storage_path # Make sure the file backend checks for a good storage dir diff --git a/tests/staticfiles_tests/test_management.py b/tests/staticfiles_tests/test_management.py index a6db5ef1c5..0d115d8596 100644 --- a/tests/staticfiles_tests/test_management.py +++ b/tests/staticfiles_tests/test_management.py @@ -319,7 +319,8 @@ class TestCollectionFilesOverride(CollectionTestCase): os.utime(self.testfile_path, (self.orig_atime - 1, self.orig_mtime - 1)) self.settings_with_test_app = self.modify_settings( - INSTALLED_APPS={'prepend': 'staticfiles_test_app'}) + INSTALLED_APPS={'prepend': 'staticfiles_test_app'}, + ) with extend_sys_path(self.temp_dir): self.settings_with_test_app.enable() diff --git a/tests/staticfiles_tests/test_storage.py b/tests/staticfiles_tests/test_storage.py index 318da6a226..f7a22b7427 100644 --- a/tests/staticfiles_tests/test_storage.py +++ b/tests/staticfiles_tests/test_storage.py @@ -348,7 +348,8 @@ class TestCollectionManifestStorage(TestHashedFiles, CollectionTestCase): f.write('to be deleted in one test') self.patched_settings = self.settings( - STATICFILES_DIRS=settings.STATICFILES_DIRS + [temp_dir]) + STATICFILES_DIRS=settings.STATICFILES_DIRS + [temp_dir], + ) self.patched_settings.enable() self.addCleanup(shutil.rmtree, temp_dir) self._manifest_strict = storage.staticfiles_storage.manifest_strict diff --git a/tests/template_tests/test_response.py b/tests/template_tests/test_response.py index 62cd14799d..39292a0713 100644 --- a/tests/template_tests/test_response.py +++ b/tests/template_tests/test_response.py @@ -249,8 +249,7 @@ class TemplateResponseTest(SimpleTestCase): self.assertEqual(response.content, b'no') def test_kwargs(self): - response = self._response(content_type='application/json', - status=504) + response = self._response(content_type='application/json', status=504) self.assertEqual(response['content-type'], 'application/json') self.assertEqual(response.status_code, 504) diff --git a/tests/test_client/tests.py b/tests/test_client/tests.py index 5c691f2b27..fb506e7ca9 100644 --- a/tests/test_client/tests.py +++ b/tests/test_client/tests.py @@ -178,8 +178,7 @@ class ClientTest(TestCase): test_doc = """ BlinkMalcolm Gladwell """ - response = self.client.post("/raw_post_view/", test_doc, - content_type="text/xml") + response = self.client.post('/raw_post_view/', test_doc, content_type='text/xml') self.assertEqual(response.status_code, 200) self.assertEqual(response.templates[0].name, "Book template") self.assertEqual(response.content, b"Blink - Malcolm Gladwell") diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py index 3cd3040ec5..33b7897b82 100644 --- a/tests/timezones/tests.py +++ b/tests/timezones/tests.py @@ -160,15 +160,18 @@ class LegacyDatabaseTests(TestCase): self.assertQuerysetEqual( Session.objects.annotate(dt=Min('events__dt')).order_by('dt'), [morning_min_dt, afternoon_min_dt], - transform=lambda d: d.dt) + transform=lambda d: d.dt, + ) self.assertQuerysetEqual( Session.objects.annotate(dt=Min('events__dt')).filter(dt__lt=afternoon_min_dt), [morning_min_dt], - transform=lambda d: d.dt) + transform=lambda d: d.dt, + ) self.assertQuerysetEqual( Session.objects.annotate(dt=Min('events__dt')).filter(dt__gte=afternoon_min_dt), [afternoon_min_dt], - transform=lambda d: d.dt) + transform=lambda d: d.dt, + ) def test_query_datetimes(self): Event.objects.create(dt=datetime.datetime(2011, 1, 1, 1, 30, 0)) @@ -389,15 +392,18 @@ class NewDatabaseTests(TestCase): self.assertQuerysetEqual( Session.objects.annotate(dt=Min('events__dt')).order_by('dt'), [morning_min_dt, afternoon_min_dt], - transform=lambda d: d.dt) + transform=lambda d: d.dt, + ) self.assertQuerysetEqual( Session.objects.annotate(dt=Min('events__dt')).filter(dt__lt=afternoon_min_dt), [morning_min_dt], - transform=lambda d: d.dt) + transform=lambda d: d.dt, + ) self.assertQuerysetEqual( Session.objects.annotate(dt=Min('events__dt')).filter(dt__gte=afternoon_min_dt), [afternoon_min_dt], - transform=lambda d: d.dt) + transform=lambda d: d.dt, + ) @skipUnlessDBFeature('has_zoneinfo_database') def test_query_datetimes(self): diff --git a/tests/update/tests.py b/tests/update/tests.py index 923af40305..f99e16b3d3 100644 --- a/tests/update/tests.py +++ b/tests/update/tests.py @@ -83,8 +83,7 @@ class AdvancedTests(TestCase): """ We can update multiple objects at once. """ - resp = DataPoint.objects.filter(value="banana").update( - value="pineapple") + resp = DataPoint.objects.filter(value='banana').update(value='pineapple') self.assertEqual(resp, 2) self.assertEqual(DataPoint.objects.get(name="d2").value, 'pineapple')