From c5cd8783825b5f6384417dac5f3889b4210b7d08 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 3 Feb 2022 11:20:46 +0100 Subject: [PATCH] Refs #33476 -- Refactored problematic code before reformatting by Black. In these cases Black produces unexpected results, e.g. def make_random_password( self, length=10, allowed_chars='abcdefghjkmnpqrstuvwxyz' 'ABCDEFGHJKLMNPQRSTUVWXYZ' '23456789', ): or cursor.execute(""" SELECT ... """, [table name], ) --- django/contrib/auth/base_user.py | 9 ++-- django/contrib/auth/hashers.py | 5 ++- django/contrib/gis/utils/srs.py | 5 ++- django/contrib/staticfiles/utils.py | 10 +++-- django/core/management/base.py | 4 +- django/db/backends/mysql/base.py | 3 +- django/db/backends/mysql/introspection.py | 35 +++++++++++----- django/db/backends/mysql/operations.py | 5 ++- django/db/backends/oracle/introspection.py | 42 +++++++++++++------ django/db/backends/oracle/operations.py | 14 +++++-- django/db/backends/oracle/schema.py | 14 +++++-- django/db/migrations/utils.py | 3 +- django/db/models/constraints.py | 3 +- django/db/models/fields/__init__.py | 3 +- django/db/models/indexes.py | 3 +- django/db/models/lookups.py | 3 +- django/db/models/query.py | 9 ++-- django/db/models/sql/query.py | 8 ++-- django/forms/models.py | 10 +++-- django/template/backends/base.py | 8 ++-- django/template/base.py | 12 +++--- django/template/defaulttags.py | 20 +++++---- django/template/loader_tags.py | 10 +++-- django/template/response.py | 5 ++- django/templatetags/i18n.py | 10 +++-- django/templatetags/tz.py | 5 ++- django/test/client.py | 3 +- tests/annotations/tests.py | 8 +--- tests/bulk_create/tests.py | 6 +-- tests/cache/tests.py | 3 +- tests/expressions/tests.py | 14 +++++-- tests/file_uploads/tests.py | 3 +- .../widget_tests/test_multiwidget.py | 3 +- tests/gis_tests/geoapp/test_functions.py | 3 +- tests/invalid_models_tests/test_models.py | 18 +++----- tests/migrations/test_commands.py | 32 +++++--------- tests/migrations/test_writer.py | 3 +- tests/model_fields/test_jsonfield.py | 3 +- tests/modeladmin/test_checks.py | 3 +- tests/postgres_tests/test_operations.py | 3 +- tests/prefetch_related/tests.py | 22 +++++----- tests/queries/tests.py | 3 +- tests/requests/test_data_upload_settings.py | 3 -- tests/requests/tests.py | 6 +-- tests/runtests.py | 3 +- tests/shell/tests.py | 5 +-- .../filter_tests/test_urlizetrunc.py | 7 ++-- .../i18n/test_get_language_info.py | 2 +- tests/template_tests/test_custom.py | 3 +- tests/test_runner/test_discover_runner.py | 3 +- tests/test_utils/tests.py | 9 +--- tests/validators/tests.py | 3 +- tests/view_tests/tests/test_debug.py | 12 ++---- 53 files changed, 227 insertions(+), 217 deletions(-) diff --git a/django/contrib/auth/base_user.py b/django/contrib/auth/base_user.py index 945a7a3d8af..cbfe5d686a4 100644 --- a/django/contrib/auth/base_user.py +++ b/django/contrib/auth/base_user.py @@ -29,10 +29,11 @@ class BaseUserManager(models.Manager): email = email_name + '@' + domain_part.lower() return email - def make_random_password(self, length=10, - allowed_chars='abcdefghjkmnpqrstuvwxyz' - 'ABCDEFGHJKLMNPQRSTUVWXYZ' - '23456789'): + def make_random_password( + self, + length=10, + allowed_chars='abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789', + ): """ Generate a random password with the given length and given allowed_chars. The default value of allowed_chars does not have "I" or diff --git a/django/contrib/auth/hashers.py b/django/contrib/auth/hashers.py index 6e1091375ca..b0b3e730b83 100644 --- a/django/contrib/auth/hashers.py +++ b/django/contrib/auth/hashers.py @@ -90,8 +90,9 @@ def get_hashers(): hasher_cls = import_string(hasher_path) hasher = hasher_cls() if not getattr(hasher, 'algorithm'): - raise ImproperlyConfigured("hasher doesn't specify an " - "algorithm name: %s" % hasher_path) + raise ImproperlyConfigured( + "hasher doesn't specify an algorithm name: %s" % hasher_path + ) hashers.append(hasher) return hashers diff --git a/django/contrib/gis/utils/srs.py b/django/contrib/gis/utils/srs.py index b10cf263b3f..d44d3403832 100644 --- a/django/contrib/gis/utils/srs.py +++ b/django/contrib/gis/utils/srs.py @@ -36,8 +36,9 @@ def add_srs_entry(srs, auth_name='EPSG', auth_srid=None, ref_sys_name=None, connection = connections[database] if not hasattr(connection.ops, 'spatial_version'): - raise Exception('The `add_srs_entry` utility only works ' - 'with spatial backends.') + raise Exception( + 'The `add_srs_entry` utility only works with spatial backends.' + ) if not connection.features.supports_add_srs_entry: raise Exception('This utility does not support your database backend.') SpatialRefSys = connection.ops.spatial_ref_sys() diff --git a/django/contrib/staticfiles/utils.py b/django/contrib/staticfiles/utils.py index 5c0a85a4513..e4297aff2b5 100644 --- a/django/contrib/staticfiles/utils.py +++ b/django/contrib/staticfiles/utils.py @@ -50,8 +50,9 @@ def check_settings(base_url=None): "You're using the staticfiles app " "without having set the required STATIC_URL setting.") if settings.MEDIA_URL == base_url: - raise ImproperlyConfigured("The MEDIA_URL and STATIC_URL " - "settings must have different values") + raise ImproperlyConfigured( + "The MEDIA_URL and STATIC_URL settings must have different values" + ) if (settings.DEBUG and settings.MEDIA_URL and settings.STATIC_URL and settings.MEDIA_URL.startswith(settings.STATIC_URL)): raise ImproperlyConfigured( @@ -59,5 +60,6 @@ def check_settings(base_url=None): ) if ((settings.MEDIA_ROOT and settings.STATIC_ROOT) and (settings.MEDIA_ROOT == settings.STATIC_ROOT)): - raise ImproperlyConfigured("The MEDIA_ROOT and STATIC_ROOT " - "settings must have different values") + raise ImproperlyConfigured( + "The MEDIA_ROOT and STATIC_ROOT settings must have different values" + ) diff --git a/django/core/management/base.py b/django/core/management/base.py index 857a77da5ac..197230fc14a 100644 --- a/django/core/management/base.py +++ b/django/core/management/base.py @@ -552,8 +552,8 @@ class AppCommand(BaseCommand): corresponding to an application label given on the command line. """ raise NotImplementedError( - "Subclasses of AppCommand must provide" - "a handle_app_config() method.") + "Subclasses of AppCommand must provide a handle_app_config() method." + ) class LabelCommand(BaseCommand): diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 3e348846cfe..ef2cd3a5aed 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -15,8 +15,7 @@ try: import MySQLdb as Database except ImportError as err: raise ImproperlyConfigured( - 'Error loading MySQLdb module.\n' - 'Did you install mysqlclient?' + 'Error loading MySQLdb module.\nDid you install mysqlclient?' ) from err from MySQLdb.constants import CLIENT, FIELD_TYPE diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py index 47ce6c3f4e6..3a761682274 100644 --- a/django/db/backends/mysql/introspection.py +++ b/django/db/backends/mysql/introspection.py @@ -79,22 +79,28 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): if self.connection.mysql_is_mariadb and self.connection.features.can_introspect_json_field: # JSON data type is an alias for LONGTEXT in MariaDB, select # JSON_VALID() constraints to introspect JSONField. - cursor.execute(""" + cursor.execute( + """ SELECT c.constraint_name AS column_name FROM information_schema.check_constraints AS c WHERE c.table_name = %s AND LOWER(c.check_clause) = 'json_valid(`' + LOWER(c.constraint_name) + '`)' AND c.constraint_schema = DATABASE() - """, [table_name]) + """, + [table_name], + ) json_constraints = {row[0] for row in cursor.fetchall()} # A default collation for the given table. - cursor.execute(""" + cursor.execute( + """ SELECT table_collation FROM information_schema.tables WHERE table_schema = DATABASE() AND table_name = %s - """, [table_name]) + """, + [table_name], + ) row = cursor.fetchone() default_column_collation = row[0] if row else '' # information_schema database gives more accurate results for some figures: @@ -102,7 +108,8 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): # not visible length (#5725) # - precision and scale (for decimal fields) (#5014) # - auto_increment is not available in cursor.description - cursor.execute(""" + cursor.execute( + """ SELECT column_name, data_type, character_maximum_length, numeric_precision, numeric_scale, extra, column_default, @@ -116,7 +123,9 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): END AS is_unsigned FROM information_schema.columns WHERE table_name = %s AND table_schema = DATABASE() - """, [default_column_collation, table_name]) + """, + [default_column_collation, table_name], + ) field_info = {line[0]: InfoLine(*line) for line in cursor.fetchall()} cursor.execute("SELECT * FROM %s LIMIT 1" % self.connection.ops.quote_name(table_name)) @@ -153,14 +162,17 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): Return a dictionary of {field_name: (field_name_other_table, other_table)} representing all foreign keys in the given table. """ - cursor.execute(""" + cursor.execute( + """ SELECT column_name, referenced_column_name, referenced_table_name FROM information_schema.key_column_usage WHERE table_name = %s AND table_schema = DATABASE() AND referenced_table_name IS NOT NULL AND referenced_column_name IS NOT NULL - """, [table_name]) + """, + [table_name], + ) return { field_name: (other_field, other_table) for field_name, other_field, other_table in cursor.fetchall() @@ -171,13 +183,16 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): Retrieve the storage engine for a given table. Return the default storage engine if the table doesn't exist. """ - cursor.execute(""" + cursor.execute( + """ SELECT engine FROM information_schema.tables WHERE table_name = %s AND table_schema = DATABASE() - """, [table_name]) + """, + [table_name], + ) result = cursor.fetchone() if not result: return self.connection.features._mysql_storage_engine diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py index 923e50a8d4f..7f1994e6577 100644 --- a/django/db/backends/mysql/operations.py +++ b/django/db/backends/mysql/operations.py @@ -233,8 +233,9 @@ class DatabaseOperations(BaseDatabaseOperations): # Zero in AUTO_INCREMENT field does not work without the # NO_AUTO_VALUE_ON_ZERO SQL mode. if value == 0 and not self.connection.features.allows_auto_pk_0: - raise ValueError('The database backend does not accept 0 as a ' - 'value for AutoField.') + raise ValueError( + 'The database backend does not accept 0 as a value for AutoField.' + ) return value def adapt_datetimefield_value(self, value): diff --git a/django/db/backends/oracle/introspection.py b/django/db/backends/oracle/introspection.py index f1f2e18e587..b8882e3cd83 100644 --- a/django/db/backends/oracle/introspection.py +++ b/django/db/backends/oracle/introspection.py @@ -93,7 +93,8 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): interface. """ # user_tab_columns gives data default for columns - cursor.execute(""" + cursor.execute( + """ SELECT user_tab_cols.column_name, user_tab_cols.data_default, @@ -126,7 +127,9 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): LEFT OUTER JOIN user_tables ON user_tables.table_name = user_tab_cols.table_name WHERE user_tab_cols.table_name = UPPER(%s) - """, [table_name]) + """, + [table_name], + ) field_map = { column: (internal_size, default if default != 'NULL' else None, collation, is_autofield, is_json) for column, default, collation, internal_size, is_autofield, is_json in cursor.fetchall() @@ -151,7 +154,8 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): return name.lower() def get_sequences(self, cursor, table_name, table_fields=()): - cursor.execute(""" + cursor.execute( + """ SELECT user_tab_identity_cols.sequence_name, user_tab_identity_cols.column_name @@ -165,7 +169,9 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): AND cols.column_name = user_tab_identity_cols.column_name AND user_constraints.constraint_type = 'P' AND user_tab_identity_cols.table_name = UPPER(%s) - """, [table_name]) + """, + [table_name], + ) # Oracle allows only one identity column per table. row = cursor.fetchone() if row: @@ -203,7 +209,8 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): } def get_primary_key_column(self, cursor, table_name): - cursor.execute(""" + cursor.execute( + """ SELECT cols.column_name FROM @@ -214,7 +221,9 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): user_constraints.constraint_type = 'P' AND user_constraints.table_name = UPPER(%s) AND cols.position = 1 - """, [table_name]) + """, + [table_name], + ) row = cursor.fetchone() return self.identifier_converter(row[0]) if row else None @@ -225,7 +234,8 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): """ constraints = {} # Loop over the constraints, getting PKs, uniques, and checks - cursor.execute(""" + cursor.execute( + """ SELECT user_constraints.constraint_name, LISTAGG(LOWER(cols.column_name), ',') WITHIN GROUP (ORDER BY cols.position), @@ -249,7 +259,9 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): user_constraints.constraint_type = ANY('P', 'U', 'C') AND user_constraints.table_name = UPPER(%s) GROUP BY user_constraints.constraint_name, user_constraints.constraint_type - """, [table_name]) + """, + [table_name], + ) for constraint, columns, pk, unique, check in cursor.fetchall(): constraint = self.identifier_converter(constraint) constraints[constraint] = { @@ -261,7 +273,8 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): 'index': unique, # All uniques come with an index } # Foreign key constraints - cursor.execute(""" + cursor.execute( + """ SELECT cons.constraint_name, LISTAGG(LOWER(cols.column_name), ',') WITHIN GROUP (ORDER BY cols.position), @@ -277,7 +290,9 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): cons.constraint_type = 'R' AND cons.table_name = UPPER(%s) GROUP BY cons.constraint_name, rcols.table_name, rcols.column_name - """, [table_name]) + """, + [table_name], + ) for constraint, columns, other_table, other_column in cursor.fetchall(): constraint = self.identifier_converter(constraint) constraints[constraint] = { @@ -289,7 +304,8 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): 'columns': columns.split(','), } # Now get indexes - cursor.execute(""" + cursor.execute( + """ SELECT ind.index_name, LOWER(ind.index_type), @@ -306,7 +322,9 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): WHERE ind.index_name = cons.index_name ) AND cols.index_name = ind.index_name GROUP BY ind.index_name, ind.index_type, ind.uniqueness - """, [table_name]) + """, + [table_name], + ) for constraint, type_, unique, columns, orders in cursor.fetchall(): constraint = self.identifier_converter(constraint) constraints[constraint] = { diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py index a10973b6b77..d53942b9190 100644 --- a/django/db/backends/oracle/operations.py +++ b/django/db/backends/oracle/operations.py @@ -377,7 +377,8 @@ END; def __foreign_key_constraints(self, table_name, recursive): with self.connection.cursor() as cursor: if recursive: - cursor.execute(""" + cursor.execute( + """ SELECT user_tables.table_name, rcons.constraint_name FROM @@ -394,9 +395,12 @@ END; user_tables.table_name, rcons.constraint_name HAVING user_tables.table_name != UPPER(%s) ORDER BY MAX(level) DESC - """, (table_name, table_name)) + """, + (table_name, table_name), + ) else: - cursor.execute(""" + cursor.execute( + """ SELECT cons.table_name, cons.constraint_name FROM @@ -404,7 +408,9 @@ END; WHERE cons.constraint_type = 'R' AND cons.table_name = UPPER(%s) - """, (table_name,)) + """, + (table_name,), + ) return cursor.fetchall() @cached_property diff --git a/django/db/backends/oracle/schema.py b/django/db/backends/oracle/schema.py index 70698b15e7a..98e49413c9e 100644 --- a/django/db/backends/oracle/schema.py +++ b/django/db/backends/oracle/schema.py @@ -179,13 +179,16 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): def _is_identity_column(self, table_name, column_name): with self.connection.cursor() as cursor: - cursor.execute(""" + cursor.execute( + """ SELECT CASE WHEN identity_column = 'YES' THEN 1 ELSE 0 END FROM user_tab_cols WHERE table_name = %s AND column_name = %s - """, [self.normalize_name(table_name), self.normalize_name(column_name)]) + """, + [self.normalize_name(table_name), self.normalize_name(column_name)], + ) row = cursor.fetchone() return row[0] if row else False @@ -197,9 +200,12 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): def _get_default_collation(self, table_name): with self.connection.cursor() as cursor: - cursor.execute(""" + cursor.execute( + """ SELECT default_collation FROM user_tables WHERE table_name = %s - """, [self.normalize_name(table_name)]) + """, + [self.normalize_name(table_name)], + ) return cursor.fetchone()[0] def _alter_column_collation_sql(self, model, new_field, new_type, new_collation): diff --git a/django/db/migrations/utils.py b/django/db/migrations/utils.py index 97bd96a90a5..42a4d903400 100644 --- a/django/db/migrations/utils.py +++ b/django/db/migrations/utils.py @@ -42,8 +42,7 @@ def resolve_relation(model, app_label=None, model_name=None): return app_label, model_name.lower() if app_label is None: raise TypeError( - 'app_label must be provided to resolve unscoped model ' - 'relationships.' + 'app_label must be provided to resolve unscoped model relationships.' ) return app_label, model.lower() return model._meta.app_label, model._meta.model_name diff --git a/django/db/models/constraints.py b/django/db/models/constraints.py index d36d076346b..5abedaf3d10 100644 --- a/django/db/models/constraints.py +++ b/django/db/models/constraints.py @@ -40,8 +40,7 @@ class CheckConstraint(BaseConstraint): self.check = check if not getattr(check, 'conditional', False): raise TypeError( - 'CheckConstraint.check must be a Q instance or boolean ' - 'expression.' + 'CheckConstraint.check must be a Q instance or boolean expression.' ) super().__init__(name) diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index fcea1597efd..6d6d10a483e 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -101,8 +101,7 @@ class Field(RegisterLookupMixin): 'invalid_choice': _('Value %(value)r is not a valid choice.'), 'null': _('This field cannot be null.'), 'blank': _('This field cannot be blank.'), - 'unique': _('%(model_name)s with this %(field_label)s ' - 'already exists.'), + 'unique': _('%(model_name)s with this %(field_label)s already exists.'), # Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. # Eg: "Title must be unique for pub_date year" 'unique_for_date': _("%(field_label)s must be unique for " diff --git a/django/db/models/indexes.py b/django/db/models/indexes.py index 9c393ca2c0c..e843f9a8cbf 100644 --- a/django/db/models/indexes.py +++ b/django/db/models/indexes.py @@ -36,8 +36,7 @@ class Index: raise ValueError('Index.opclasses must be a list or tuple.') if not expressions and not fields: raise ValueError( - 'At least one field or expression is required to define an ' - 'index.' + 'At least one field or expression is required to define an index.' ) if expressions and fields: raise ValueError( diff --git a/django/db/models/lookups.py b/django/db/models/lookups.py index 9315ae80395..24bfb11c060 100644 --- a/django/db/models/lookups.py +++ b/django/db/models/lookups.py @@ -530,8 +530,7 @@ class IsNull(BuiltinLookup): def as_sql(self, compiler, connection): if not isinstance(self.rhs, bool): raise ValueError( - 'The QuerySet value for an isnull lookup must be True or ' - 'False.' + 'The QuerySet value for an isnull lookup must be True or False.' ) sql, params = compiler.compile(self.lhs) if self.rhs: diff --git a/django/db/models/query.py b/django/db/models/query.py index e20c46075e2..0bc6aec2f34 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -523,8 +523,7 @@ class QuerySet: ) if not unique_fields and db_features.supports_update_conflicts_with_target: raise ValueError( - 'Unique fields that can trigger the upsert must be ' - 'provided.' + 'Unique fields that can trigger the upsert must be provided.' ) # Updating primary keys and non-concrete fields is forbidden. update_fields = [self.model._meta.get_field(name) for name in update_fields] @@ -930,8 +929,7 @@ class QuerySet: self._not_support_combined_queries('contains') if self._fields is not None: raise TypeError( - 'Cannot call QuerySet.contains() after .values() or ' - '.values_list().' + 'Cannot call QuerySet.contains() after .values() or .values_list().' ) try: if obj._meta.concrete_model != self.model._meta.concrete_model: @@ -1739,8 +1737,7 @@ class Prefetch: ) ): raise ValueError( - 'Prefetch querysets cannot use raw(), values(), and ' - 'values_list().' + 'Prefetch querysets cannot use raw(), values(), and values_list().' ) if to_attr: self.prefetch_to = LOOKUP_SEP.join(lookup.split(LOOKUP_SEP)[:-1] + [to_attr]) diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index e3fdea6f3a3..1dc770ae3a6 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1735,8 +1735,7 @@ class Query(BaseExpression): for alias in self._gen_col_aliases([annotation]): if isinstance(self.alias_map[alias], Join): raise FieldError( - 'Joined field references are not permitted in ' - 'this query' + 'Joined field references are not permitted in this query' ) if summarize: # Summarize currently means we are doing an aggregate() query @@ -1763,8 +1762,9 @@ class Query(BaseExpression): if not allow_joins and len(join_list) > 1: raise FieldError('Joined field references are not permitted in this query') if len(targets) > 1: - raise FieldError("Referencing multicolumn fields with F() objects " - "isn't supported") + raise FieldError( + "Referencing multicolumn fields with F() objects isn't supported" + ) # Verify that the last lookup in name is a field or a transform: # transform_function() raises FieldError if not. transform = join_info.transform_function(targets[0], final_alias) diff --git a/django/forms/models.py b/django/forms/models.py index c82aaf12e1b..19a5cb142a8 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -1218,8 +1218,9 @@ class ModelChoiceField(ChoiceField): # This class is a subclass of ChoiceField for purity, but it doesn't # actually use any of ChoiceField's implementation. default_error_messages = { - 'invalid_choice': _('Select a valid choice. That choice is not one of' - ' the available choices.'), + 'invalid_choice': _( + 'Select a valid choice. That choice is not one of the available choices.' + ), } iterator = ModelChoiceIterator @@ -1338,8 +1339,9 @@ class ModelMultipleChoiceField(ModelChoiceField): hidden_widget = MultipleHiddenInput default_error_messages = { 'invalid_list': _('Enter a list of values.'), - 'invalid_choice': _('Select a valid choice. %(value)s is not one of the' - ' available choices.'), + 'invalid_choice': _( + 'Select a valid choice. %(value)s is not one of the available choices.' + ), 'invalid_pk_value': _('“%(pk)s” is not a valid value.') } diff --git a/django/template/backends/base.py b/django/template/backends/base.py index 22628c63552..f1fa142362f 100644 --- a/django/template/backends/base.py +++ b/django/template/backends/base.py @@ -38,8 +38,8 @@ class BaseEngine: This method is optional. """ raise NotImplementedError( - "subclasses of BaseEngine should provide " - "a from_string() method") + "subclasses of BaseEngine should provide a from_string() method" + ) def get_template(self, template_name): """ @@ -48,8 +48,8 @@ class BaseEngine: Raise TemplateDoesNotExist if no such template exists. """ raise NotImplementedError( - "subclasses of BaseEngine must provide " - "a get_template() method") + "subclasses of BaseEngine must provide a get_template() method" + ) # Utility methods: they are provided to minimize code duplication and # security issues in third-party backends. diff --git a/django/template/base.py b/django/template/base.py index e55293b8d10..caadf899703 100644 --- a/django/template/base.py +++ b/django/template/base.py @@ -675,8 +675,9 @@ class FilterExpression: except VariableDoesNotExist: var_obj = None elif var is None: - raise TemplateSyntaxError("Could not find variable at " - "start of %s." % token) + raise TemplateSyntaxError( + "Could not find variable at start of %s." % token + ) else: var_obj = Variable(var) else: @@ -884,9 +885,10 @@ class Variable: ValueError, # invalid literal for int() KeyError, # current is a dict without `int(bit)` key TypeError): # unsubscriptable object - raise VariableDoesNotExist("Failed lookup for key " - "[%s] in %r", - (bit, current)) # missing attribute + raise VariableDoesNotExist( + "Failed lookup for key [%s] in %r", + (bit, current), + ) # missing attribute if callable(current): if getattr(current, 'do_not_call_in_templates', False): pass diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 99c09a483a6..9090b14e409 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -793,8 +793,9 @@ def do_for(parser, token): """ bits = token.split_contents() if len(bits) < 4: - raise TemplateSyntaxError("'for' statements should have at least four" - " words: %s" % token.contents) + raise TemplateSyntaxError( + "'for' statements should have at least four words: %s" % token.contents + ) is_reversed = bits[-1] == 'reversed' in_index = -3 if is_reversed else -2 @@ -806,8 +807,9 @@ def do_for(parser, token): loopvars = re.split(r' *, *', ' '.join(bits[1:in_index])) for var in loopvars: if not var or not invalid_chars.isdisjoint(var): - raise TemplateSyntaxError("'for' tag received an invalid argument:" - " %s" % token.contents) + raise TemplateSyntaxError( + "'for' tag received an invalid argument: %s" % token.contents + ) sequence = parser.compile_filter(bits[in_index + 1]) nodelist_loop = parser.parse(('empty', 'endfor',)) @@ -1160,8 +1162,9 @@ def regroup(parser, token): if bits[2] != 'by': raise TemplateSyntaxError("second argument to 'regroup' tag must be 'by'") if bits[4] != 'as': - raise TemplateSyntaxError("next-to-last argument to 'regroup' tag must" - " be 'as'") + raise TemplateSyntaxError( + "next-to-last argument to 'regroup' tag must be 'as'" + ) var_name = bits[5] # RegroupNode will take each item in 'target', put it in the context under # 'var_name', evaluate 'var_name'.'expression' in the current context, and @@ -1420,8 +1423,9 @@ def do_with(parser, token): remaining_bits = bits[1:] extra_context = token_kwargs(remaining_bits, parser, support_legacy=True) if not extra_context: - raise TemplateSyntaxError("%r expected at least one variable " - "assignment" % bits[0]) + raise TemplateSyntaxError( + "%r expected at least one variable assignment" % bits[0] + ) if remaining_bits: raise TemplateSyntaxError("%r received an invalid token: %r" % (bits[0], remaining_bits[0])) diff --git a/django/template/loader_tags.py b/django/template/loader_tags.py index 3e770751d1f..37cefaf9c77 100644 --- a/django/template/loader_tags.py +++ b/django/template/loader_tags.py @@ -315,13 +315,15 @@ def do_include(parser, token): while remaining_bits: option = remaining_bits.pop(0) if option in options: - raise TemplateSyntaxError('The %r option was specified more ' - 'than once.' % option) + raise TemplateSyntaxError( + 'The %r option was specified more than once.' % option + ) if option == 'with': value = token_kwargs(remaining_bits, parser, support_legacy=False) if not value: - raise TemplateSyntaxError('"with" in %r tag needs at least ' - 'one keyword argument.' % bits[0]) + raise TemplateSyntaxError( + '"with" in %r tag needs at least one keyword argument.' % bits[0] + ) elif option == 'only': value = True else: diff --git a/django/template/response.py b/django/template/response.py index 9efadcd7264..63d2f4a577a 100644 --- a/django/template/response.py +++ b/django/template/response.py @@ -49,8 +49,9 @@ class SimpleTemplateResponse(HttpResponse): """ obj_dict = self.__dict__.copy() if not self._is_rendered: - raise ContentNotRenderedError('The response content must be ' - 'rendered before it can be pickled.') + raise ContentNotRenderedError( + 'The response content must be rendered before it can be pickled.' + ) for attr in self.rendering_attrs: if attr in obj_dict: del obj_dict[attr] diff --git a/django/templatetags/i18n.py b/django/templatetags/i18n.py index 607ceb6aea9..efe5f289412 100644 --- a/django/templatetags/i18n.py +++ b/django/templatetags/i18n.py @@ -477,13 +477,15 @@ def do_block_translate(parser, token): while remaining_bits: option = remaining_bits.pop(0) if option in options: - raise TemplateSyntaxError('The %r option was specified more ' - 'than once.' % option) + raise TemplateSyntaxError( + 'The %r option was specified more than once.' % option + ) if option == 'with': value = token_kwargs(remaining_bits, parser, support_legacy=True) if not value: - raise TemplateSyntaxError('"with" in %r tag needs at least ' - 'one keyword argument.' % bits[0]) + raise TemplateSyntaxError( + '"with" in %r tag needs at least one keyword argument.' % bits[0] + ) elif option == 'count': value = token_kwargs(remaining_bits, parser, support_legacy=True) if len(value) != 1: diff --git a/django/templatetags/tz.py b/django/templatetags/tz.py index 455c2ed3893..489391a267a 100644 --- a/django/templatetags/tz.py +++ b/django/templatetags/tz.py @@ -209,6 +209,7 @@ def get_current_timezone_tag(parser, token): # token.split_contents() isn't useful here because this tag doesn't accept variable as arguments args = token.contents.split() if len(args) != 3 or args[1] != 'as': - raise TemplateSyntaxError("'get_current_timezone' requires " - "'as variable' (got %r)" % args) + raise TemplateSyntaxError( + "'get_current_timezone' requires 'as variable' (got %r)" % args + ) return GetCurrentTimezoneNode(args[2]) diff --git a/django/test/client.py b/django/test/client.py index 6e8d0f4d9d2..af1090a7405 100644 --- a/django/test/client.py +++ b/django/test/client.py @@ -894,8 +894,7 @@ class AsyncClient(ClientMixin, AsyncRequestFactory): """ if 'follow' in request: raise NotImplementedError( - 'AsyncClient request methods do not accept the follow ' - 'parameter.' + 'AsyncClient request methods do not accept the follow parameter.' ) scope = self._base_scope(**request) # Curry a data dictionary into an instance of the template renderer diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py index 2c2b946835b..1755a9f4358 100644 --- a/tests/annotations/tests.py +++ b/tests/annotations/tests.py @@ -987,8 +987,7 @@ class AliasTests(TestCase): def test_aggregate_alias(self): msg = ( - "Cannot aggregate over the 'other_age' alias. Use annotate() to " - "promote it." + "Cannot aggregate over the 'other_age' alias. Use annotate() to promote it." ) with self.assertRaisesMessage(FieldError, msg): Author.objects.alias( @@ -1012,10 +1011,7 @@ class AliasTests(TestCase): def test_values_alias(self): qs = Book.objects.alias(rating_alias=F('rating') - 1) - msg = ( - "Cannot select the 'rating_alias' alias. Use annotate() to " - "promote it." - ) + msg = "Cannot select the 'rating_alias' alias. Use annotate() to promote it." for operation in ['values', 'values_list']: with self.subTest(operation=operation): with self.assertRaisesMessage(FieldError, msg): diff --git a/tests/bulk_create/tests.py b/tests/bulk_create/tests.py index 7e5ff323804..8040f16dcf5 100644 --- a/tests/bulk_create/tests.py +++ b/tests/bulk_create/tests.py @@ -429,8 +429,7 @@ class BulkCreateTests(TestCase): ) def test_update_conflicts_invalid_update_fields(self): msg = ( - 'bulk_create() can only be used with concrete fields in ' - 'update_fields.' + 'bulk_create() can only be used with concrete fields in update_fields.' ) # Reverse one-to-one relationship. with self.assertRaisesMessage(ValueError, msg): @@ -467,8 +466,7 @@ class BulkCreateTests(TestCase): ) def test_update_conflicts_invalid_unique_fields(self): msg = ( - 'bulk_create() can only be used with concrete fields in ' - 'unique_fields.' + 'bulk_create() can only be used with concrete fields in unique_fields.' ) # Reverse one-to-one relationship. with self.assertRaisesMessage(ValueError, msg): diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 07f6fea48d9..6327698dfac 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -70,8 +70,7 @@ def empty_response(request): KEY_ERRORS_WITH_MEMCACHED_MSG = ( - 'Cache key contains characters that will cause errors if used with ' - 'memcached: %r' + 'Cache key contains characters that will cause errors if used with memcached: %r' ) diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index 89c6a7c8de1..dcde321c573 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -409,16 +409,22 @@ class BasicExpressionsTests(TestCase): def test_order_by_multiline_sql(self): raw_order_by = ( - RawSQL(''' + RawSQL( + """ CASE WHEN num_employees > 1000 THEN num_chairs ELSE 0 END - ''', []).desc(), - RawSQL(''' + """, + [], + ).desc(), + RawSQL( + """ CASE WHEN num_chairs > 1 THEN 1 ELSE 0 END - ''', []).asc() + """, + [], + ).asc() ) for qs in ( Company.objects.all(), diff --git a/tests/file_uploads/tests.py b/tests/file_uploads/tests.py index 522441fd221..78898e2b1e8 100644 --- a/tests/file_uploads/tests.py +++ b/tests/file_uploads/tests.py @@ -649,8 +649,7 @@ class FileUploadTests(TestCase): 'Content-Disposition: form-data; name="file_field"; filename="MiXeD_cAsE.txt"', 'Content-Type: application/octet-stream', '', - 'file contents\n' - '', + 'file contents\n', '--%(boundary)s--\r\n', ] response = self.client.post( diff --git a/tests/forms_tests/widget_tests/test_multiwidget.py b/tests/forms_tests/widget_tests/test_multiwidget.py index 0e5ee8f73ff..cb1e9d31c57 100644 --- a/tests/forms_tests/widget_tests/test_multiwidget.py +++ b/tests/forms_tests/widget_tests/test_multiwidget.py @@ -212,8 +212,7 @@ class MultiWidgetTest(WidgetTest): def test_no_whitespace_between_widgets(self): widget = MyMultiWidget(widgets=(TextInput, TextInput())) self.check_html(widget, 'code', None, html=( - '' - '' + '' ), strict=True) def test_deepcopy(self): diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index a1b1f48e02b..67e4313f3fd 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -370,8 +370,7 @@ class GISFunctionsTests(FuncTestMixin, TestCase): @skipUnlessDBFeature('has_MakeValid_function') def test_make_valid_multipolygon(self): invalid_geom = fromstr( - 'POLYGON((0 0, 0 1 , 1 1 , 1 0, 0 0), ' - '(10 0, 10 1, 11 1, 11 0, 10 0))' + 'POLYGON((0 0, 0 1 , 1 1 , 1 0, 0 0), (10 0, 10 1, 11 1, 11 0, 10 0))' ) State.objects.create(name='invalid', poly=invalid_geom) invalid = State.objects.filter(name='invalid').annotate( diff --git a/tests/invalid_models_tests/test_models.py b/tests/invalid_models_tests/test_models.py index 4a36ac82854..c8c4cfa420c 100644 --- a/tests/invalid_models_tests/test_models.py +++ b/tests/invalid_models_tests/test_models.py @@ -1707,8 +1707,7 @@ class ConstraintsTests(TestCase): self.assertEqual(Model.check(databases=self.databases), [ Error( - "'constraints' refers to the nonexistent field " - "'missing_field'.", + "'constraints' refers to the nonexistent field 'missing_field'.", obj=Model, id='models.E012', ), @@ -1972,8 +1971,7 @@ class ConstraintsTests(TestCase): self.assertEqual(Model.check(databases=self.databases), [ Error( - "'constraints' refers to the nonexistent field " - "'missing_field'.", + "'constraints' refers to the nonexistent field 'missing_field'.", obj=Model, id='models.E012', ), @@ -2075,8 +2073,7 @@ class ConstraintsTests(TestCase): self.assertEqual(Model.check(databases=self.databases), [ Error( - "'constraints' refers to the nonexistent field " - "'missing_field'.", + "'constraints' refers to the nonexistent field 'missing_field'.", obj=Model, id='models.E012', ), @@ -2193,8 +2190,7 @@ class ConstraintsTests(TestCase): self.assertEqual(Model.check(databases=self.databases), [ Error( - "'constraints' refers to the nonexistent field " - "'missing_field'.", + "'constraints' refers to the nonexistent field 'missing_field'.", obj=Model, id='models.E012', ), @@ -2331,8 +2327,7 @@ class ConstraintsTests(TestCase): self.assertEqual(Model.check(databases=self.databases), [ Error( - "'constraints' refers to the nonexistent field " - "'missing_field'.", + "'constraints' refers to the nonexistent field 'missing_field'.", obj=Model, id='models.E012', ), @@ -2348,8 +2343,7 @@ class ConstraintsTests(TestCase): self.assertEqual(Model.check(databases=self.databases), [ Error( - "'constraints' refers to the nonexistent field " - "'missing_field'.", + "'constraints' refers to the nonexistent field 'missing_field'.", obj=Model, id='models.E012', ), diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index 5709372cbc1..0c62db8ae6c 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -308,9 +308,7 @@ class MigrateTests(MigrationTestBase): with mock.patch('django.core.management.color.supports_color', lambda *args: True): call_command("showmigrations", format='list', stdout=out, verbosity=0, no_color=False) self.assertEqual( - '\x1b[1mmigrations\n\x1b[0m' - ' [ ] 0001_initial\n' - ' [ ] 0002_second\n', + '\x1b[1mmigrations\n\x1b[0m [ ] 0001_initial\n [ ] 0002_second\n', out.getvalue().lower() ) @@ -320,9 +318,7 @@ class MigrateTests(MigrationTestBase): # Giving the explicit app_label tests for selective `show_list` in the command call_command("showmigrations", "migrations", format='list', stdout=out, verbosity=0, no_color=True) self.assertEqual( - 'migrations\n' - ' [x] 0001_initial\n' - ' [ ] 0002_second\n', + 'migrations\n [x] 0001_initial\n [ ] 0002_second\n', out.getvalue().lower() ) out = io.StringIO() @@ -343,8 +339,7 @@ class MigrateTests(MigrationTestBase): out = io.StringIO() call_command('showmigrations', format='list', stdout=out, verbosity=2, no_color=True) self.assertEqual( - 'migrations\n' - ' [ ] 0001_squashed_0002 (2 squashed migrations)\n', + 'migrations\n [ ] 0001_squashed_0002 (2 squashed migrations)\n', out.getvalue().lower(), ) out = io.StringIO() @@ -368,8 +363,7 @@ class MigrateTests(MigrationTestBase): out = io.StringIO() call_command('showmigrations', format='list', stdout=out, verbosity=2, no_color=True) self.assertEqual( - 'migrations\n' - ' [x] 0001_squashed_0002 (2 squashed migrations)\n', + 'migrations\n [x] 0001_squashed_0002 (2 squashed migrations)\n', out.getvalue().lower(), ) finally: @@ -447,8 +441,7 @@ class MigrateTests(MigrationTestBase): # Show the plan for when there is nothing to apply. call_command('migrate', 'migrations', '0003', plan=True, stdout=out, no_color=True) self.assertEqual( - 'Planned operations:\n' - ' No planned migration operations.\n', + 'Planned operations:\n No planned migration operations.\n', out.getvalue() ) out = io.StringIO() @@ -609,8 +602,7 @@ class MigrateTests(MigrationTestBase): out = io.StringIO() call_command('showmigrations', 'mutate_state_b', format='plan', stdout=out) self.assertEqual( - '[ ] mutate_state_b.0001_initial\n' - '[ ] mutate_state_b.0002_add_field\n', + '[ ] mutate_state_b.0001_initial\n[ ] mutate_state_b.0002_add_field\n', out.getvalue() ) # Single app with dependencies. @@ -911,8 +903,7 @@ class MigrateTests(MigrationTestBase): call_command("migrate", "migrations", verbosity=0) call_command("showmigrations", "migrations", stdout=out, no_color=True) self.assertEqual( - 'migrations\n' - ' [x] 0001_squashed_0002 (2 squashed migrations)\n', + 'migrations\n [x] 0001_squashed_0002 (2 squashed migrations)\n', out.getvalue().lower() ) applied_migrations = recorder.applied_migrations() @@ -944,8 +935,7 @@ class MigrateTests(MigrationTestBase): call_command("migrate", "migrations", verbosity=0) call_command("showmigrations", "migrations", stdout=out, no_color=True) self.assertEqual( - 'migrations\n' - ' [x] 0001_squashed_0002 (2 squashed migrations)\n', + 'migrations\n [x] 0001_squashed_0002 (2 squashed migrations)\n', out.getvalue().lower() ) self.assertIn( @@ -1115,8 +1105,7 @@ class MigrateTests(MigrationTestBase): call_command('migrate', 'migrations', prune=True, stdout=out, no_color=True) self.assertEqual( out.getvalue(), - 'Pruning migrations:\n' - ' No migrations to prune.\n', + 'Pruning migrations:\n No migrations to prune.\n', ) out = io.StringIO() call_command( @@ -2311,8 +2300,7 @@ class AppLabelErrorTests(TestCase): """ nonexistent_app_error = "No installed app with label 'nonexistent_app'." did_you_mean_auth_error = ( - "No installed app with label 'django.contrib.auth'. Did you mean " - "'auth'?" + "No installed app with label 'django.contrib.auth'. Did you mean 'auth'?" ) def test_makemigrations_nonexistent_app_label(self): diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py index 4506e6b5414..f55c48a0d49 100644 --- a/tests/migrations/test_writer.py +++ b/tests/migrations/test_writer.py @@ -86,8 +86,7 @@ class OperationWriterTests(SimpleTestCase): self.assertEqual(imports, {'import custom_migration_operations.operations'}) self.assertEqual( buff, - 'custom_migration_operations.operations.TestOperation(\n' - '),' + 'custom_migration_operations.operations.TestOperation(\n),', ) def test_args_signature(self): diff --git a/tests/model_fields/test_jsonfield.py b/tests/model_fields/test_jsonfield.py index f7721aa6e81..faedd451cbe 100644 --- a/tests/model_fields/test_jsonfield.py +++ b/tests/model_fields/test_jsonfield.py @@ -129,8 +129,7 @@ class TestFormField(SimpleTestCase): class TestSerialization(SimpleTestCase): test_data = ( - '[{"fields": {"value": %s}, ' - '"model": "model_fields.jsonmodel", "pk": null}]' + '[{"fields": {"value": %s}, "model": "model_fields.jsonmodel", "pk": null}]' ) test_values = ( # (Python value, serialized value), diff --git a/tests/modeladmin/test_checks.py b/tests/modeladmin/test_checks.py index 1d6f1ba023a..b08d52e6dd6 100644 --- a/tests/modeladmin/test_checks.py +++ b/tests/modeladmin/test_checks.py @@ -411,8 +411,7 @@ class PrepopulatedFieldsCheckTests(CheckTestCase): self.assertIsInvalid( TestModelAdmin, ValidationTestModel, - 'The value of \'prepopulated_fields["slug"]\' must be a list ' - 'or tuple.', + 'The value of \'prepopulated_fields["slug"]\' must be a list or tuple.', 'admin.E029' ) diff --git a/tests/postgres_tests/test_operations.py b/tests/postgres_tests/test_operations.py index 1464f3177ed..790fef8332a 100644 --- a/tests/postgres_tests/test_operations.py +++ b/tests/postgres_tests/test_operations.py @@ -53,8 +53,7 @@ class AddIndexConcurrentlyTests(OperationTestBase): operation = AddIndexConcurrently('Pony', index) self.assertEqual( operation.describe(), - 'Concurrently create index pony_pink_idx on field(s) pink of ' - 'model Pony' + 'Concurrently create index pony_pink_idx on field(s) pink of model Pony', ) operation.state_forwards(self.app_label, new_state) self.assertEqual(len(new_state.models[self.app_label, 'pony'].options['indexes']), 1) diff --git a/tests/prefetch_related/tests.py b/tests/prefetch_related/tests.py index 18f5de746fd..b6de7653912 100644 --- a/tests/prefetch_related/tests.py +++ b/tests/prefetch_related/tests.py @@ -1352,9 +1352,10 @@ class MultiDbTests(TestCase): books = "".join("%s (%s)\n" % (b.title, ", ".join(a.name for a in b.first_time_authors.all())) for b in B.prefetch_related('first_time_authors')) - self.assertEqual(books, - "Poems (Charlotte Bronte)\n" - "Sense and Sensibility (Jane Austen)\n") + self.assertEqual( + books, + "Poems (Charlotte Bronte)\nSense and Sensibility (Jane Austen)\n", + ) def test_using_is_honored_inheritance(self): B = BookWithYear.objects.using('other') @@ -1391,19 +1392,20 @@ class MultiDbTests(TestCase): books = "".join("%s (%s)\n" % (b.title, ", ".join(a.name for a in b.first_time_authors.all())) for b in B.prefetch_related(prefetch)) - self.assertEqual(books, - "Poems (Charlotte Bronte)\n" - "Sense and Sensibility (Jane Austen)\n") - + self.assertEqual( + books, + "Poems (Charlotte Bronte)\nSense and Sensibility (Jane Austen)\n", + ) # Explicit using on the same db. with self.assertNumQueries(2, using='other'): prefetch = Prefetch('first_time_authors', queryset=Author.objects.using('other')) books = "".join("%s (%s)\n" % (b.title, ", ".join(a.name for a in b.first_time_authors.all())) for b in B.prefetch_related(prefetch)) - self.assertEqual(books, - "Poems (Charlotte Bronte)\n" - "Sense and Sensibility (Jane Austen)\n") + self.assertEqual( + books, + "Poems (Charlotte Bronte)\nSense and Sensibility (Jane Austen)\n", + ) # Explicit using on a different db. with self.assertNumQueries(1, using='default'), self.assertNumQueries(1, using='other'): diff --git a/tests/queries/tests.py b/tests/queries/tests.py index f146bc89fd6..09aaad95a96 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -3149,8 +3149,7 @@ class QuerySetExceptionTests(SimpleTestCase): def test_invalid_order_by(self): msg = ( - "Cannot resolve keyword '*' into field. Choices are: created, id, " - "name" + "Cannot resolve keyword '*' into field. Choices are: created, id, name" ) with self.assertRaisesMessage(FieldError, msg): Article.objects.order_by('*') diff --git a/tests/requests/test_data_upload_settings.py b/tests/requests/test_data_upload_settings.py index 44897cc9fa9..6f44dbd10d2 100644 --- a/tests/requests/test_data_upload_settings.py +++ b/tests/requests/test_data_upload_settings.py @@ -41,7 +41,6 @@ class DataUploadMaxMemorySizeMultipartPostTests(SimpleTestCase): '', 'value', '--boundary--' - '' ])) self.request = WSGIRequest({ 'REQUEST_METHOD': 'POST', @@ -70,7 +69,6 @@ class DataUploadMaxMemorySizeMultipartPostTests(SimpleTestCase): '', 'value', '--boundary--' - '' ])) request = WSGIRequest({ 'REQUEST_METHOD': 'POST', @@ -143,7 +141,6 @@ class DataUploadMaxNumberOfFieldsMultipartPost(SimpleTestCase): '', 'value2', '--boundary--' - '' ])) self.request = WSGIRequest({ 'REQUEST_METHOD': 'POST', diff --git a/tests/requests/tests.py b/tests/requests/tests.py index 3d8bb45b00b..bc7c0165b24 100644 --- a/tests/requests/tests.py +++ b/tests/requests/tests.py @@ -316,7 +316,7 @@ class RequestsTests(SimpleTestCase): '', 'value', '--boundary--' - ''])) + ])) request = WSGIRequest({ 'REQUEST_METHOD': 'POST', 'CONTENT_TYPE': 'multipart/form-data; boundary=boundary', @@ -341,7 +341,7 @@ class RequestsTests(SimpleTestCase): b'', b'value', b'--boundary--' - b'']) + ]) payload = FakePayload(payload_data) request = WSGIRequest({ 'REQUEST_METHOD': 'POST', @@ -366,7 +366,7 @@ class RequestsTests(SimpleTestCase): '', 'value', '--boundary--' - ''])) + ])) request = WSGIRequest({ 'REQUEST_METHOD': 'POST', 'CONTENT_TYPE': 'multipart/form-data; boundary=boundary', diff --git a/tests/runtests.py b/tests/runtests.py index 6bad838a959..64400bd8921 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -292,8 +292,7 @@ def setup_run_tests(verbosity, start_at, start_after, test_labels=None): # Force declaring available_apps in TransactionTestCase for faster tests. def no_available_apps(self): raise Exception( - 'Please define available_apps in TransactionTestCase and its ' - 'subclasses.' + 'Please define available_apps in TransactionTestCase and its subclasses.' ) TransactionTestCase.available_apps = property(no_available_apps) TestCase.available_apps = None diff --git a/tests/shell/tests.py b/tests/shell/tests.py index df32562f6b0..aadd6181091 100644 --- a/tests/shell/tests.py +++ b/tests/shell/tests.py @@ -11,10 +11,7 @@ from django.test.utils import captured_stdin, captured_stdout class ShellCommandTestCase(SimpleTestCase): script_globals = 'print("__name__" in globals())' script_with_inline_function = ( - 'import django\n' - 'def f():\n' - ' print(django.__version__)\n' - 'f()' + 'import django\ndef f():\n print(django.__version__)\nf()' ) def test_command_option(self): diff --git a/tests/template_tests/filter_tests/test_urlizetrunc.py b/tests/template_tests/filter_tests/test_urlizetrunc.py index e37e2772124..09bbe776cf4 100644 --- a/tests/template_tests/filter_tests/test_urlizetrunc.py +++ b/tests/template_tests/filter_tests/test_urlizetrunc.py @@ -60,14 +60,13 @@ class FunctionTests(SimpleTestCase): self.assertEqual( urlizetrunc(uri, 1), - '…', + '…', ) def test_overtruncate(self): self.assertEqual( - urlizetrunc('http://short.com/', 20), 'http://short.com/', + urlizetrunc('http://short.com/', 20), + 'http://short.com/', ) def test_query_string(self): diff --git a/tests/template_tests/syntax_tests/i18n/test_get_language_info.py b/tests/template_tests/syntax_tests/i18n/test_get_language_info.py index 51e8d2bc796..4ae8186af5a 100644 --- a/tests/template_tests/syntax_tests/i18n/test_get_language_info.py +++ b/tests/template_tests/syntax_tests/i18n/test_get_language_info.py @@ -36,7 +36,7 @@ class I18nGetLanguageInfoTagTests(SimpleTestCase): output = self.engine.render_to_string('i18n38') self.assertEqual(output, 'de: German/Deutsch/německy bidi=False') - @setup({'template': '{% load i18n %}''{% get_language_info %}'}) + @setup({'template': '{% load i18n %}{% get_language_info %}'}) def test_no_for_as(self): msg = "'get_language_info' requires 'for string as variable' (got [])" with self.assertRaisesMessage(TemplateSyntaxError, msg): diff --git a/tests/template_tests/test_custom.py b/tests/template_tests/test_custom.py index cade3e46103..59f83d80e24 100644 --- a/tests/template_tests/test_custom.py +++ b/tests/template_tests/test_custom.py @@ -104,8 +104,7 @@ class SimpleTagTests(TagTestCase): ( "'simple_keyword_only_param' received multiple values for " "keyword argument 'kwarg'", - '{% load custom %}{% simple_keyword_only_param kwarg=42 ' - 'kwarg=37 %}', + '{% load custom %}{% simple_keyword_only_param kwarg=42 kwarg=37 %}', ), ( "'simple_keyword_only_default' received multiple values for " diff --git a/tests/test_runner/test_discover_runner.py b/tests/test_runner/test_discover_runner.py index 7fef5652df0..dedc36aeb76 100644 --- a/tests/test_runner/test_discover_runner.py +++ b/tests/test_runner/test_discover_runner.py @@ -445,8 +445,7 @@ class DiscoverRunnerTests(SimpleTestCase): def test_pdb_with_parallel(self): msg = ( - 'You cannot use --pdb with parallel tests; pass --parallel=1 to ' - 'use it.' + 'You cannot use --pdb with parallel tests; pass --parallel=1 to use it.' ) with self.assertRaisesMessage(ValueError, msg): DiscoverRunner(pdb=True, parallel=2) diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py index 94743731385..0da45d9f641 100644 --- a/tests/test_utils/tests.py +++ b/tests/test_utils/tests.py @@ -437,8 +437,7 @@ class AssertNumQueriesContextManagerTests(TestCase): def test_failure(self): msg = ( - '1 != 2 : 1 queries executed, 2 expected\nCaptured queries were:\n' - '1.' + '1 != 2 : 1 queries executed, 2 expected\nCaptured queries were:\n1.' ) with self.assertRaisesMessage(AssertionError, msg): with self.assertNumQueries(2): @@ -927,11 +926,7 @@ class HTMLEqualTests(SimpleTestCase): parse_html('

') def test_escaped_html_errors(self): - msg = ( - '

\n\n

' - ' != ' - '

\n<foo>\n

\n' - ) + msg = '

\n\n

!=

\n<foo>\n

\n' with self.assertRaisesMessage(AssertionError, msg): self.assertHTMLEqual('

', '

<foo>

') with self.assertRaisesMessage(AssertionError, msg): diff --git a/tests/validators/tests.py b/tests/validators/tests.py index 78063a58cc9..585edd71171 100644 --- a/tests/validators/tests.py +++ b/tests/validators/tests.py @@ -133,8 +133,7 @@ VALID_URLS = [ 'ample.com', 'http://example.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' 'aaaaa.com', - 'http://example.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' - 'aaaaa', + 'http://example.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'http://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaa' 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaa' 'aaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaa' diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py index 84d675b79b7..8fc7ea2fcd3 100644 --- a/tests/view_tests/tests/test_debug.py +++ b/tests/view_tests/tests/test_debug.py @@ -690,14 +690,12 @@ class ExceptionReporterTests(SimpleTestCase): html, ) self.assertIn( - '"generated", line 2, in funcName\n' - ' <source code not available>', + '"generated", line 2, in funcName\n <source code not available>', html, ) text = reporter.get_traceback_text() self.assertIn( - '"generated", line 2, in funcName\n' - ' ', + '"generated", line 2, in funcName\n ', text, ) @@ -731,14 +729,12 @@ class ExceptionReporterTests(SimpleTestCase): html, ) self.assertIn( - '"generated", line 2, in funcName\n' - ' <source code not available>', + '"generated", line 2, in funcName\n <source code not available>', html, ) text = reporter.get_traceback_text() self.assertIn( - '"generated", line 2, in funcName\n' - ' ', + '"generated", line 2, in funcName\n ', text, )