summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-12-06 17:17:59 -0500
committerGitHub <noreply@github.com>2017-12-06 17:17:59 -0500
commita862af383969ade774f6b0fa1d331bc87b188b89 (patch)
tree57a264753921cb1ac689efeb9b78dd43fcdd1db0 /django
parent183fb7b2b9778f7d7cc91f5a7e5afec61b85179e (diff)
Fixed #28893 -- Removed unnecessary dict.items() calls.
Diffstat (limited to 'django')
-rw-r--r--django/core/management/commands/inspectdb.py2
-rw-r--r--django/core/servers/basehttp.py2
-rw-r--r--django/db/migrations/autodetector.py10
-rw-r--r--django/db/models/deletion.py2
-rw-r--r--django/db/models/sql/query.py2
-rw-r--r--django/test/utils.py2
-rw-r--r--django/views/debug.py4
7 files changed, 12 insertions, 12 deletions
diff --git a/django/core/management/commands/inspectdb.py b/django/core/management/commands/inspectdb.py
index dbcb5d1f38..4d453ea86b 100644
--- a/django/core/management/commands/inspectdb.py
+++ b/django/core/management/commands/inspectdb.py
@@ -264,7 +264,7 @@ class Command(BaseCommand):
to the given database table name.
"""
unique_together = []
- for index, params in constraints.items():
+ for params in constraints.values():
if params['unique']:
columns = params['columns']
if len(columns) > 1:
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index f36317e216..89306683b8 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -128,7 +128,7 @@ class WSGIRequestHandler(simple_server.WSGIRequestHandler):
# the WSGI environ. This prevents header-spoofing based on ambiguity
# between underscores and dashes both normalized to underscores in WSGI
# env vars. Nginx and Apache 2.4+ both do this as well.
- for k, v in self.headers.items():
+ for k in self.headers:
if '_' in k:
del self.headers[k]
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py
index e7a8e20d4e..dfbadc9d22 100644
--- a/django/db/migrations/autodetector.py
+++ b/django/db/migrations/autodetector.py
@@ -349,7 +349,7 @@ class MigrationAutodetector:
m2.dependencies.append((app_label, m1.name))
# De-dupe dependencies
- for app_label, migrations in self.migrations.items():
+ for migrations in self.migrations.values():
for migration in migrations:
migration.dependencies = list(set(migration.dependencies))
@@ -590,7 +590,7 @@ class MigrationAutodetector:
# Generate other opns
related_dependencies = [
(app_label, model_name, name, True)
- for name, field in sorted(related_fields.items())
+ for name in sorted(related_fields)
]
related_dependencies.append((app_label, model_name, None, True))
for index in indexes:
@@ -738,7 +738,7 @@ class MigrationAutodetector:
)
)
# Then remove each related field
- for name, field in sorted(related_fields.items()):
+ for name in sorted(related_fields):
self.add_operation(
app_label,
operations.RemoveField(
@@ -759,7 +759,7 @@ class MigrationAutodetector:
if not related_object.many_to_many:
dependencies.append((related_object_app_label, object_name, field_name, "alter"))
- for name, field in sorted(related_fields.items()):
+ for name in sorted(related_fields):
dependencies.append((app_label, model_name, name, False))
# We're referenced in another field's through=
through_user = self.through_users.get((app_label, model_state.name_lower))
@@ -1173,7 +1173,7 @@ class MigrationAutodetector:
next_number += 1
migration.name = new_name
# Now fix dependencies
- for app_label, migrations in changes.items():
+ for migrations in changes.values():
for migration in migrations:
migration.dependencies = [name_map.get(d, d) for d in migration.dependencies]
return changes
diff --git a/django/db/models/deletion.py b/django/db/models/deletion.py
index 537011487a..7c0b2c58a4 100644
--- a/django/db/models/deletion.py
+++ b/django/db/models/deletion.py
@@ -308,7 +308,7 @@ class Collector:
)
# update collected instances
- for model, instances_for_fieldvalues in self.field_updates.items():
+ for instances_for_fieldvalues in self.field_updates.values():
for (field, value), instances in instances_for_fieldvalues.items():
for obj in instances:
setattr(obj, field.attname, value)
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index ab5c41ed4f..81fcd6921f 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1749,7 +1749,7 @@ class Query:
"""
group_by = list(self.select)
if self.annotation_select:
- for alias, annotation in self.annotation_select.items():
+ for annotation in self.annotation_select.values():
for col in annotation.get_group_by_cols():
group_by.append(col)
self.group_by = tuple(group_by)
diff --git a/django/test/utils.py b/django/test/utils.py
index fc783a4fc8..0cec1a2309 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -160,7 +160,7 @@ def setup_databases(verbosity, interactive, keepdb=False, debug_sql=False, paral
old_names = []
- for signature, (db_name, aliases) in test_databases.items():
+ for db_name, aliases in test_databases.values():
first_alias = None
for alias in aliases:
connection = connections[alias]
diff --git a/django/views/debug.py b/django/views/debug.py
index a0af0c96f4..ffe53d7e5b 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -164,7 +164,7 @@ class SafeExceptionReporterFilter(ExceptionReporterFilter):
cleansed = request.POST.copy()
if sensitive_post_parameters == '__ALL__':
# Cleanse all parameters.
- for k, v in cleansed.items():
+ for k in cleansed:
cleansed[k] = CLEANSED_SUBSTITUTE
return cleansed
else:
@@ -213,7 +213,7 @@ class SafeExceptionReporterFilter(ExceptionReporterFilter):
if self.is_active(request) and sensitive_variables:
if sensitive_variables == '__ALL__':
# Cleanse all variables
- for name, value in tb_frame.f_locals.items():
+ for name in tb_frame.f_locals:
cleansed[name] = CLEANSED_SUBSTITUTE
else:
# Cleanse specified variables