diff options
| author | David Smith <smithdc@gmail.com> | 2023-02-01 07:13:39 +0000 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-02-01 11:52:33 +0100 |
| commit | e565a5cd187197a6349e55d7a4c68a9e12e2fd20 (patch) | |
| tree | 7c4f7a507f80833bd17f59b7d5ca723bcdc349da /django | |
| parent | 4cf73314c4704509a7587b3f24201cf179d64f79 (diff) | |
[4.0.x] Refs #33476 -- Applied Black's 2023 stable style.
Black 23.1.0 is released which, as the first release of the year,
introduces the 2023 stable style. This incorporates most of last year's
preview style.
https://github.com/psf/black/releases/tag/23.1.0
Backport of 097e3a70c1481ee7b042b2edd91b2be86fb7b5b6 from main.
Diffstat (limited to 'django')
63 files changed, 19 insertions, 64 deletions
diff --git a/django/contrib/admin/migrations/0001_initial.py b/django/contrib/admin/migrations/0001_initial.py index d02e128497..6270e1032d 100644 --- a/django/contrib/admin/migrations/0001_initial.py +++ b/django/contrib/admin/migrations/0001_initial.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ("contenttypes", "__first__"), diff --git a/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py b/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py index 4e83978e21..7fcf9c0c39 100644 --- a/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py +++ b/django/contrib/admin/migrations/0002_logentry_remove_auto_add.py @@ -3,7 +3,6 @@ from django.utils import timezone class Migration(migrations.Migration): - dependencies = [ ("admin", "0001_initial"), ] diff --git a/django/contrib/admin/migrations/0003_logentry_add_action_flag_choices.py b/django/contrib/admin/migrations/0003_logentry_add_action_flag_choices.py index 59b22314d4..a73e55fc25 100644 --- a/django/contrib/admin/migrations/0003_logentry_add_action_flag_choices.py +++ b/django/contrib/admin/migrations/0003_logentry_add_action_flag_choices.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("admin", "0002_logentry_remove_auto_add"), ] diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 20e6b3a626..46099b93a3 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -977,7 +977,7 @@ class ModelAdmin(BaseModelAdmin): base_action_names = {name for _, name, _ in base_actions} # Gather actions from the admin site first - for (name, func) in self.admin_site.actions: + for name, func in self.admin_site.actions: if name in base_action_names: continue description = self._get_action_description(func, name) @@ -1101,6 +1101,7 @@ class ModelAdmin(BaseModelAdmin): Return a tuple containing a queryset to implement the search and a boolean indicating if the results may contain duplicates. """ + # Apply keyword searches. def construct_search(field_name): if field_name.startswith("^"): diff --git a/django/contrib/admin/tests.py b/django/contrib/admin/tests.py index e3def6ec5a..70b746958d 100644 --- a/django/contrib/admin/tests.py +++ b/django/contrib/admin/tests.py @@ -17,7 +17,6 @@ class CSPMiddleware(MiddlewareMixin): @modify_settings(MIDDLEWARE={"append": "django.contrib.admin.tests.CSPMiddleware"}) class AdminSeleniumTestCase(SeleniumTestCase, StaticLiveServerTestCase): - available_apps = [ "django.contrib.admin", "django.contrib.auth", diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py index e3c53fc7e8..bb7fe0ec52 100644 --- a/django/contrib/admindocs/views.py +++ b/django/contrib/admindocs/views.py @@ -143,7 +143,7 @@ class ViewIndexView(BaseAdminDocsView): view_functions = extract_views_from_urlpatterns(url_resolver.url_patterns) except ImproperlyConfigured: view_functions = [] - for (func, regex, namespace, name) in view_functions: + for func, regex, namespace, name in view_functions: views.append( { "full_name": get_view_name(func), diff --git a/django/contrib/auth/migrations/0001_initial.py b/django/contrib/auth/migrations/0001_initial.py index 3d1635f461..cfeaa3aeae 100644 --- a/django/contrib/auth/migrations/0001_initial.py +++ b/django/contrib/auth/migrations/0001_initial.py @@ -5,7 +5,6 @@ from django.utils import timezone class Migration(migrations.Migration): - dependencies = [ ("contenttypes", "__first__"), ] diff --git a/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py b/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py index a9ca6f51a9..67a9560aa8 100644 --- a/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py +++ b/django/contrib/auth/migrations/0002_alter_permission_name_max_length.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("auth", "0001_initial"), ] diff --git a/django/contrib/auth/migrations/0003_alter_user_email_max_length.py b/django/contrib/auth/migrations/0003_alter_user_email_max_length.py index 8a57548460..13d437e72e 100644 --- a/django/contrib/auth/migrations/0003_alter_user_email_max_length.py +++ b/django/contrib/auth/migrations/0003_alter_user_email_max_length.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("auth", "0002_alter_permission_name_max_length"), ] diff --git a/django/contrib/auth/migrations/0004_alter_user_username_opts.py b/django/contrib/auth/migrations/0004_alter_user_username_opts.py index 6930e9bccb..f3fe36adcb 100644 --- a/django/contrib/auth/migrations/0004_alter_user_username_opts.py +++ b/django/contrib/auth/migrations/0004_alter_user_username_opts.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("auth", "0003_alter_user_email_max_length"), ] diff --git a/django/contrib/auth/migrations/0005_alter_user_last_login_null.py b/django/contrib/auth/migrations/0005_alter_user_last_login_null.py index 8407e2d822..42b584e9f5 100644 --- a/django/contrib/auth/migrations/0005_alter_user_last_login_null.py +++ b/django/contrib/auth/migrations/0005_alter_user_last_login_null.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("auth", "0004_alter_user_username_opts"), ] diff --git a/django/contrib/auth/migrations/0006_require_contenttypes_0002.py b/django/contrib/auth/migrations/0006_require_contenttypes_0002.py index b4e816a56f..2032c112a0 100644 --- a/django/contrib/auth/migrations/0006_require_contenttypes_0002.py +++ b/django/contrib/auth/migrations/0006_require_contenttypes_0002.py @@ -2,7 +2,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ("auth", "0005_alter_user_last_login_null"), ("contenttypes", "0002_remove_content_type_name"), diff --git a/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py b/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py index 3c94141e61..ca010807c8 100644 --- a/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py +++ b/django/contrib/auth/migrations/0007_alter_validators_add_error_messages.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("auth", "0006_require_contenttypes_0002"), ] diff --git a/django/contrib/auth/migrations/0008_alter_user_username_max_length.py b/django/contrib/auth/migrations/0008_alter_user_username_max_length.py index bfb844bb2a..caac0f1d69 100644 --- a/django/contrib/auth/migrations/0008_alter_user_username_max_length.py +++ b/django/contrib/auth/migrations/0008_alter_user_username_max_length.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("auth", "0007_alter_validators_add_error_messages"), ] diff --git a/django/contrib/auth/migrations/0009_alter_user_last_name_max_length.py b/django/contrib/auth/migrations/0009_alter_user_last_name_max_length.py index e0665366d0..d347829064 100644 --- a/django/contrib/auth/migrations/0009_alter_user_last_name_max_length.py +++ b/django/contrib/auth/migrations/0009_alter_user_last_name_max_length.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("auth", "0008_alter_user_username_max_length"), ] diff --git a/django/contrib/auth/migrations/0010_alter_group_name_max_length.py b/django/contrib/auth/migrations/0010_alter_group_name_max_length.py index a58e11480f..8ba274477f 100644 --- a/django/contrib/auth/migrations/0010_alter_group_name_max_length.py +++ b/django/contrib/auth/migrations/0010_alter_group_name_max_length.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("auth", "0009_alter_user_last_name_max_length"), ] diff --git a/django/contrib/auth/migrations/0012_alter_user_first_name_max_length.py b/django/contrib/auth/migrations/0012_alter_user_first_name_max_length.py index 839c950417..1014f20498 100644 --- a/django/contrib/auth/migrations/0012_alter_user_first_name_max_length.py +++ b/django/contrib/auth/migrations/0012_alter_user_first_name_max_length.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("auth", "0011_update_proxy_permissions"), ] diff --git a/django/contrib/contenttypes/migrations/0001_initial.py b/django/contrib/contenttypes/migrations/0001_initial.py index 5468fb6a0d..7ea39d4f3f 100644 --- a/django/contrib/contenttypes/migrations/0001_initial.py +++ b/django/contrib/contenttypes/migrations/0001_initial.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [] operations = [ diff --git a/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py b/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py index 3bee3a864f..a835fc4d6c 100644 --- a/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py +++ b/django/contrib/contenttypes/migrations/0002_remove_content_type_name.py @@ -12,7 +12,6 @@ def add_legacy_name(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ("contenttypes", "0001_initial"), ] diff --git a/django/contrib/flatpages/migrations/0001_initial.py b/django/contrib/flatpages/migrations/0001_initial.py index 631ebbcb1e..db95098841 100644 --- a/django/contrib/flatpages/migrations/0001_initial.py +++ b/django/contrib/flatpages/migrations/0001_initial.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("sites", "0001_initial"), ] diff --git a/django/contrib/gis/admin/widgets.py b/django/contrib/gis/admin/widgets.py index 420c170608..76c786b0aa 100644 --- a/django/contrib/gis/admin/widgets.py +++ b/django/contrib/gis/admin/widgets.py @@ -86,6 +86,7 @@ class OpenLayersWidget(Textarea): def map_options(self): """Build the map options hash for the OpenLayers template.""" + # JavaScript construction utilities for the Bounds and Projection. def ol_bounds(extent): return "new OpenLayers.Bounds(%s)" % extent diff --git a/django/contrib/gis/db/backends/oracle/operations.py b/django/contrib/gis/db/backends/oracle/operations.py index ba7e3ca4d8..9a8816aeac 100644 --- a/django/contrib/gis/db/backends/oracle/operations.py +++ b/django/contrib/gis/db/backends/oracle/operations.py @@ -54,7 +54,6 @@ class SDORelate(SpatialOperator): class OracleOperations(BaseSpatialOperations, DatabaseOperations): - name = "oracle" oracle = True disallowed_aggregates = (models.Collect, models.Extent3D, models.MakeLine) diff --git a/django/contrib/gis/geos/geometry.py b/django/contrib/gis/geos/geometry.py index 8cee9a35dc..4f7c356752 100644 --- a/django/contrib/gis/geos/geometry.py +++ b/django/contrib/gis/geos/geometry.py @@ -20,7 +20,6 @@ from django.utils.encoding import force_bytes, force_str class GEOSGeometryBase(GEOSBase): - _GEOS_CLASSES = None ptr_type = GEOM_PTR diff --git a/django/contrib/redirects/migrations/0001_initial.py b/django/contrib/redirects/migrations/0001_initial.py index 3b3b87962a..7881d5798c 100644 --- a/django/contrib/redirects/migrations/0001_initial.py +++ b/django/contrib/redirects/migrations/0001_initial.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("sites", "0001_initial"), ] diff --git a/django/contrib/redirects/migrations/0002_alter_redirect_new_path_help_text.py b/django/contrib/redirects/migrations/0002_alter_redirect_new_path_help_text.py index 84f67e10d9..9976366005 100644 --- a/django/contrib/redirects/migrations/0002_alter_redirect_new_path_help_text.py +++ b/django/contrib/redirects/migrations/0002_alter_redirect_new_path_help_text.py @@ -2,7 +2,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("redirects", "0001_initial"), ] diff --git a/django/contrib/sessions/migrations/0001_initial.py b/django/contrib/sessions/migrations/0001_initial.py index 83b0bbc2ae..42e382aa32 100644 --- a/django/contrib/sessions/migrations/0001_initial.py +++ b/django/contrib/sessions/migrations/0001_initial.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [] operations = [ diff --git a/django/contrib/sitemaps/views.py b/django/contrib/sitemaps/views.py index cd315fa065..f9658f9949 100644 --- a/django/contrib/sitemaps/views.py +++ b/django/contrib/sitemaps/views.py @@ -28,7 +28,6 @@ def index( content_type="application/xml", sitemap_url_name="django.contrib.sitemaps.views.sitemap", ): - req_protocol = request.scheme req_site = get_current_site(request) @@ -59,7 +58,6 @@ def sitemap( template_name="sitemap.xml", content_type="application/xml", ): - req_protocol = request.scheme req_site = get_current_site(request) diff --git a/django/contrib/sites/migrations/0001_initial.py b/django/contrib/sites/migrations/0001_initial.py index 181cf47ad7..a23f0f129b 100644 --- a/django/contrib/sites/migrations/0001_initial.py +++ b/django/contrib/sites/migrations/0001_initial.py @@ -4,7 +4,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [] operations = [ diff --git a/django/contrib/sites/migrations/0002_alter_domain_unique.py b/django/contrib/sites/migrations/0002_alter_domain_unique.py index ccc7bfc384..e379a91f67 100644 --- a/django/contrib/sites/migrations/0002_alter_domain_unique.py +++ b/django/contrib/sites/migrations/0002_alter_domain_unique.py @@ -3,7 +3,6 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ("sites", "0001_initial"), ] diff --git a/django/contrib/sites/models.py b/django/contrib/sites/models.py index e1544f1fa2..7f8bce920e 100644 --- a/django/contrib/sites/models.py +++ b/django/contrib/sites/models.py @@ -77,7 +77,6 @@ class SiteManager(models.Manager): class Site(models.Model): - domain = models.CharField( _("domain name"), max_length=100, diff --git a/django/core/cache/backends/db.py b/django/core/cache/backends/db.py index c6bdb45709..e1d4a62b51 100644 --- a/django/core/cache/backends/db.py +++ b/django/core/cache/backends/db.py @@ -40,7 +40,6 @@ class BaseDatabaseCache(BaseCache): class DatabaseCache(BaseDatabaseCache): - # This class uses cursors provided by the database connection. This means # it reads expiration values as aware or naive datetimes, depending on the # value of USE_TZ and whether the database supports time zones. The ORM's diff --git a/django/core/management/commands/dumpdata.py b/django/core/management/commands/dumpdata.py index 038b82698d..cc183517e3 100644 --- a/django/core/management/commands/dumpdata.py +++ b/django/core/management/commands/dumpdata.py @@ -193,7 +193,7 @@ class Command(BaseCommand): # There is no need to sort dependencies when natural foreign # keys are not used. models = [] - for (app_config, model_list) in app_list.items(): + for app_config, model_list in app_list.items(): if model_list is None: models.extend(app_config.get_models()) else: diff --git a/django/core/management/commands/squashmigrations.py b/django/core/management/commands/squashmigrations.py index 2529c4d5de..9e5afe55d3 100644 --- a/django/core/management/commands/squashmigrations.py +++ b/django/core/management/commands/squashmigrations.py @@ -56,7 +56,6 @@ class Command(BaseCommand): ) def handle(self, **options): - self.verbosity = options["verbosity"] self.interactive = options["interactive"] app_label = options["app_label"] diff --git a/django/core/management/templates.py b/django/core/management/templates.py index 32ceee89d7..d3208e660f 100644 --- a/django/core/management/templates.py +++ b/django/core/management/templates.py @@ -150,7 +150,6 @@ class TemplateCommand(BaseCommand): prefix_length = len(template_dir) + 1 for root, dirs, files in os.walk(template_dir): - path_rest = root[prefix_length:] relative_dir = path_rest.replace(base_name, name) if relative_dir: diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index a3918bf9d2..c15d412846 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -122,8 +122,7 @@ def Deserializer( field_names = field_names_cache[Model] # Handle each field - for (field_name, field_value) in d["fields"].items(): - + for field_name, field_value in d["fields"].items(): if ignorenonexistent and field_name not in field_names: # skip fields no longer on model continue diff --git a/django/db/backends/base/creation.py b/django/db/backends/base/creation.py index 21327465c0..a4ea136a7b 100644 --- a/django/db/backends/base/creation.py +++ b/django/db/backends/base/creation.py @@ -117,6 +117,7 @@ class BaseDatabaseCreation: Designed only for test runner usage; will not handle large amounts of data. """ + # Iteratively return every object for all models to serialize. def get_objects(): from django.db.migrations.loader import MigrationLoader diff --git a/django/db/backends/base/operations.py b/django/db/backends/base/operations.py index ac14b0556f..295c61f02e 100644 --- a/django/db/backends/base/operations.py +++ b/django/db/backends/base/operations.py @@ -264,6 +264,7 @@ class BaseDatabaseOperations: exists for database backends to provide a better implementation according to their own quoting schemes. """ + # Convert params to contain string values. def to_string(s): return force_str(s, strings_only=True, errors="replace") diff --git a/django/db/backends/mysql/schema.py b/django/db/backends/mysql/schema.py index 7ab12f2a81..dcd2a5982a 100644 --- a/django/db/backends/mysql/schema.py +++ b/django/db/backends/mysql/schema.py @@ -3,7 +3,6 @@ from django.db.models import NOT_PROVIDED class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): - sql_rename_table = "RENAME TABLE %(old_table)s TO %(new_table)s" sql_alter_column_null = "MODIFY %(column)s %(type)s NULL" diff --git a/django/db/backends/oracle/schema.py b/django/db/backends/oracle/schema.py index e4178ec10b..e5fcce61c2 100644 --- a/django/db/backends/oracle/schema.py +++ b/django/db/backends/oracle/schema.py @@ -10,7 +10,6 @@ from django.db.backends.base.schema import ( class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): - sql_create_column = "ALTER TABLE %(table)s ADD %(column)s %(definition)s" sql_alter_column_type = "MODIFY %(column)s %(type)s" sql_alter_column_null = "MODIFY %(column)s NULL" diff --git a/django/db/backends/postgresql/schema.py b/django/db/backends/postgresql/schema.py index 73e2749020..fc2814479e 100644 --- a/django/db/backends/postgresql/schema.py +++ b/django/db/backends/postgresql/schema.py @@ -6,7 +6,6 @@ from django.db.backends.utils import strip_quotes class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): - sql_create_sequence = "CREATE SEQUENCE %(sequence)s" sql_delete_sequence = "DROP SEQUENCE IF EXISTS %(sequence)s CASCADE" sql_set_sequence_max = ( diff --git a/django/db/backends/sqlite3/schema.py b/django/db/backends/sqlite3/schema.py index 072e53f6fc..0cf77e97e9 100644 --- a/django/db/backends/sqlite3/schema.py +++ b/django/db/backends/sqlite3/schema.py @@ -11,7 +11,6 @@ from django.db.transaction import atomic class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): - sql_delete_table = "DROP TABLE %(table)s" sql_create_fk = None sql_create_inline_fk = ( @@ -189,6 +188,7 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor): 4. Rename the "new__app_model" table to "app_model" 5. Restore any index of the previous "app_model" table. """ + # Self-referential fields must be recreated rather than copied from # the old model to ensure their remote_field.field_name doesn't refer # to an altered field. diff --git a/django/db/backends/utils.py b/django/db/backends/utils.py index 26d07d6638..a65639b1dd 100644 --- a/django/db/backends/utils.py +++ b/django/db/backends/utils.py @@ -95,7 +95,6 @@ class CursorWrapper: class CursorDebugWrapper(CursorWrapper): - # XXX callproc isn't instrumented at this time. def execute(self, sql, params=None): diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py index 5a727d4540..f48f2e14fe 100644 --- a/django/db/migrations/operations/models.py +++ b/django/db/migrations/operations/models.py @@ -384,7 +384,7 @@ class RenameModel(ModelOperation): fields = zip( old_model._meta.local_many_to_many, new_model._meta.local_many_to_many ) - for (old_field, new_field) in fields: + for old_field, new_field in fields: # Skip self-referential fields as these are renamed above. if ( new_field.model == new_field.related_model @@ -489,7 +489,7 @@ class AlterModelTable(ModelOptionOperation): new_model._meta.db_table, ) # Rename M2M fields whose name is based on this model's db_table - for (old_field, new_field) in zip( + for old_field, new_field in zip( old_model._meta.local_many_to_many, new_model._meta.local_many_to_many ): if new_field.remote_field.through._meta.auto_created: diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 4c5f132439..e8fac1e026 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -927,7 +927,6 @@ class Star(Expression): class Col(Expression): - contains_column_references = True possibly_multivalued = False diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py index 1a3a0ce5fc..91248cd1a5 100644 --- a/django/db/models/fields/files.py +++ b/django/db/models/fields/files.py @@ -221,7 +221,6 @@ class FileDescriptor(DeferredAttribute): class FileField(Field): - # The class to wrap instance attributes in. Accessing the file object off # the instance will always return an instance of attr_class. attr_class = FieldFile diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 6f08c27aba..51aa6692ee 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -342,7 +342,6 @@ class RelatedField(FieldCacheMixin, Field): return None def contribute_to_class(self, cls, name, private_only=False, **kwargs): - super().contribute_to_class(cls, name, private_only=private_only, **kwargs) self.opts = cls._meta @@ -538,7 +537,6 @@ class ForeignObject(RelatedField): swappable=True, **kwargs, ): - if rel is None: rel = self.rel_class( self, @@ -1598,7 +1596,6 @@ class ManyToManyField(RelatedField): (source_field_name, source), (target_field_name, target), ): - possible_field_names = [] for f in through._meta.fields: if ( diff --git a/django/db/models/functions/datetime.py b/django/db/models/functions/datetime.py index 5f98e6bba1..ad7c9dfb24 100644 --- a/django/db/models/functions/datetime.py +++ b/django/db/models/functions/datetime.py @@ -337,7 +337,6 @@ class TruncBase(TimezoneMixin, Transform): class Trunc(TruncBase): - # RemovedInDjango50Warning: when the deprecation ends, remove is_dst # argument. def __init__( diff --git a/django/db/models/options.py b/django/db/models/options.py index 6b0749b537..83e58c279c 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -520,6 +520,7 @@ class Options: combined with filtering of field properties is the public API for obtaining this field list. """ + # For legacy reasons, the fields property should only contain forward # fields that are not private or with a m2m cardinality. Therefore we # pass these three filters as filters to the generator. diff --git a/django/db/models/query.py b/django/db/models/query.py index 57adf60c00..1614d6c144 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -438,7 +438,7 @@ class QuerySet: kwargs[arg.default_alias] = arg query = self.query.chain() - for (alias, aggregate_expr) in kwargs.items(): + for alias, aggregate_expr in kwargs.items(): query.add_annotation(aggregate_expr, alias, is_summary=True) annotation = query.annotations[alias] if not annotation.contains_aggregate: @@ -1762,7 +1762,7 @@ class RawQuerySet: """ columns = self.query.get_columns() # Adjust any column names which don't match field names - for (query_name, model_name) in self.translations.items(): + for query_name, model_name in self.translations.items(): # Ignore translations for nonexistent column names try: index = columns.index(query_name) diff --git a/django/forms/widgets.py b/django/forms/widgets.py index 12b9bbbd4f..b7f097cd5d 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -483,7 +483,6 @@ class ClearableFileInput(FileInput): if not self.is_required and CheckboxInput().value_from_datadict( data, files, self.clear_checkbox_name(name) ): - if upload: # If the user contradicts themselves (uploads a new file AND # checks the "clear" checkbox), we return a unique marker diff --git a/django/template/backends/base.py b/django/template/backends/base.py index 240733e6f4..991ce64cb7 100644 --- a/django/template/backends/base.py +++ b/django/template/backends/base.py @@ -5,7 +5,6 @@ from django.utils.functional import cached_property class BaseEngine: - # Core methods: engines have to provide their own implementation # (except for from_string which is optional). diff --git a/django/template/backends/django.py b/django/template/backends/django.py index a440674d99..8404e8e86c 100644 --- a/django/template/backends/django.py +++ b/django/template/backends/django.py @@ -12,7 +12,6 @@ from .base import BaseEngine class DjangoTemplates(BaseEngine): - app_dirname = "templates" def __init__(self, params): diff --git a/django/template/backends/dummy.py b/django/template/backends/dummy.py index 692382b6b1..cf0c0012a8 100644 --- a/django/template/backends/dummy.py +++ b/django/template/backends/dummy.py @@ -9,7 +9,6 @@ from .utils import csrf_input_lazy, csrf_token_lazy class TemplateStrings(BaseEngine): - app_dirname = "template_strings" def __init__(self, params): diff --git a/django/template/backends/jinja2.py b/django/template/backends/jinja2.py index 92cc2255e0..e847edb807 100644 --- a/django/template/backends/jinja2.py +++ b/django/template/backends/jinja2.py @@ -11,7 +11,6 @@ from .base import BaseEngine class Jinja2(BaseEngine): - app_dirname = "jinja2" def __init__(self, params): diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index 59049069de..b10a811c7c 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -309,7 +309,6 @@ class IfNode(Node): def render(self, context): for condition, nodelist in self.conditions_nodelists: - if condition is not None: # if / elif clause try: match = condition.eval(context) diff --git a/django/test/client.py b/django/test/client.py index 772fe116e3..9521c50b53 100644 --- a/django/test/client.py +++ b/django/test/client.py @@ -256,7 +256,7 @@ def encode_multipart(boundary, data): # Each bit of the multipart form data could be either a form value or a # file, or a *list* of form values and/or files. Remember that HTTP field # names can be duplicated! - for (key, value) in data.items(): + for key, value in data.items(): if value is None: raise TypeError( "Cannot encode None for key '%s' as POST data. Did you mean " diff --git a/django/test/runner.py b/django/test/runner.py index 99afd2013b..c7d36aed83 100644 --- a/django/test/runner.py +++ b/django/test/runner.py @@ -607,7 +607,6 @@ class DiscoverRunner: logger=None, **kwargs, ): - self.pattern = pattern self.top_level = top_level self.verbosity = verbosity diff --git a/django/test/testcases.py b/django/test/testcases.py index 2bf7b98736..1cfbad2691 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -169,7 +169,6 @@ class _DatabaseFailure: class SimpleTestCase(unittest.TestCase): - # The class we'll use for the test client self.client. # Can be overridden in derived classes. client_class = Client @@ -720,7 +719,6 @@ class SimpleTestCase(unittest.TestCase): ) def _assert_template_used(self, response, template_name, msg_prefix): - if response is None and template_name is None: raise TypeError("response and/or template_name argument must be provided") @@ -1074,7 +1072,6 @@ class SimpleTestCase(unittest.TestCase): class TransactionTestCase(SimpleTestCase): - # Subclasses can ask for resetting of auto increment sequence before each # test case reset_sequences = False diff --git a/django/utils/cache.py b/django/utils/cache.py index efea44fd7a..217ac419d7 100644 --- a/django/utils/cache.py +++ b/django/utils/cache.py @@ -80,7 +80,7 @@ def patch_cache_control(response, **kwargs): elif "public" in cc and "private" in kwargs: del cc["public"] - for (k, v) in kwargs.items(): + for k, v in kwargs.items(): directive = k.replace("_", "-") if directive == "no-cache": # no-cache supports multiple field names. diff --git a/django/utils/decorators.py b/django/utils/decorators.py index e412bb15e1..fb53983241 100644 --- a/django/utils/decorators.py +++ b/django/utils/decorators.py @@ -57,6 +57,7 @@ def method_decorator(decorator, name=""): """ Convert a function decorator into a method decorator """ + # 'obj' can be a class or a function. If 'obj' is a function at the time it # is passed to _dec, it will eventually be a method of the class it is # defined on. If 'obj' is a class, the 'name' is required to be the name diff --git a/django/utils/numberformat.py b/django/utils/numberformat.py index 488d6a77cd..12f546bf9f 100644 --- a/django/utils/numberformat.py +++ b/django/utils/numberformat.py @@ -39,7 +39,6 @@ def format( if isinstance(number, float) and "e" in str(number).lower(): number = Decimal(str(number)) if isinstance(number, Decimal): - if decimal_pos is not None: # If the provided number is too small to affect any of the visible # decimal places, consider it equal to '0'. diff --git a/django/views/decorators/common.py b/django/views/decorators/common.py index 8c84688122..e231491ba9 100644 --- a/django/views/decorators/common.py +++ b/django/views/decorators/common.py @@ -6,6 +6,7 @@ def no_append_slash(view_func): Mark a view function as excluded from CommonMiddleware's APPEND_SLASH redirection. """ + # view_func.should_append_slash = False would also work, but decorators are # nicer if they don't have side effects, so return a new function. def wrapped_view(*args, **kwargs): diff --git a/django/views/decorators/csrf.py b/django/views/decorators/csrf.py index 4841089ca8..0c8703a31e 100644 --- a/django/views/decorators/csrf.py +++ b/django/views/decorators/csrf.py @@ -48,6 +48,7 @@ uses the csrf_token template tag, or the CsrfViewMiddleware is used. def csrf_exempt(view_func): """Mark a view function as being exempt from the CSRF view protection.""" + # view_func.csrf_exempt = True would also work, but decorators are nicer # if they don't have side effects, so return a new function. def wrapped_view(*args, **kwargs): |
