Fixed #28249 -- Removed unnecessary dict.keys() calls.

iter(dict) is equivalent to iter(dict.keys()).

18 files changed, 51 insertions, 49 deletions

diff --git a/tests/backends/tests.py b/tests/backends/tests.py
index 7ea11b846f..7a9981c0ac 100644
--- a/tests/backends/tests.py
+++ b/tests/backends/tests.py
@@ -755,7 +755,7 @@ class BackendTestCase(TransactionTestCase):
 
         self.assertIsInstance(connection.queries, list)
         self.assertIsInstance(connection.queries[0], dict)
-        self.assertCountEqual(connection.queries[0].keys(), ['sql', 'time'])
+        self.assertCountEqual(connection.queries[0], ['sql', 'time'])
 
         reset_queries()
         self.assertEqual(0, len(connection.queries))
diff --git a/tests/basic/tests.py b/tests/basic/tests.py
index 12da117edf..d55277c0f2 100644
--- a/tests/basic/tests.py
+++ b/tests/basic/tests.py
@@ -602,7 +602,7 @@ class ManagerTest(SimpleTestCase):
         `Manager` will need to be added to `ManagerTest.QUERYSET_PROXY_METHODS`.
         """
         self.assertEqual(
-            sorted(BaseManager._get_queryset_methods(QuerySet).keys()),
+            sorted(BaseManager._get_queryset_methods(QuerySet)),
             sorted(self.QUERYSET_PROXY_METHODS),
         )
 
diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index e14c72754d..2c6b50fe38 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -240,7 +240,7 @@ def caches_setting_for_tests(base=None, exclude=None, **params):
     # params -> _caches_setting_base -> base
     base = base or {}
     exclude = exclude or set()
-    setting = {k: base.copy() for k in _caches_setting_base.keys() if k not in exclude}
+    setting = {k: base.copy() for k in _caches_setting_base if k not in exclude}
     for key, cache_params in setting.items():
         cache_params.update(_caches_setting_base[key])
         cache_params.update(params)
diff --git a/tests/file_uploads/views.py b/tests/file_uploads/views.py
index f2964e1793..5c35a5a378 100644
--- a/tests/file_uploads/views.py
+++ b/tests/file_uploads/views.py
@@ -125,7 +125,7 @@ def file_upload_getlist_count(request):
     """
     file_counts = {}
 
-    for key in request.FILES.keys():
+    for key in request.FILES:
         file_counts[key] = len(request.FILES.getlist(key))
     return JsonResponse(file_counts)
 
diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index cc73819091..f5d992442b 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -1558,19 +1558,19 @@ value="Should escape < & > and <script>alert('xss')</
                 self.order_fields(field_order=TestForm.field_order)
 
         p = TestFormParent()
-        self.assertEqual(list(p.fields.keys()), TestFormParent.field_order)
+        self.assertEqual(list(p.fields), TestFormParent.field_order)
         p = TestFormRemove()
-        self.assertEqual(list(p.fields.keys()), TestForm.field_order)
+        self.assertEqual(list(p.fields), TestForm.field_order)
         p = TestFormMissing()
-        self.assertEqual(list(p.fields.keys()), TestForm.field_order)
+        self.assertEqual(list(p.fields), TestForm.field_order)
         p = TestForm()
-        self.assertEqual(list(p.fields.keys()), TestFormMissing.field_order)
+        self.assertEqual(list(p.fields), TestFormMissing.field_order)
         p = TestFormInit()
         order = list(TestForm.field_order) + ['field1']
-        self.assertEqual(list(p.fields.keys()), order)
+        self.assertEqual(list(p.fields), order)
         TestForm.field_order = ['unknown']
         p = TestForm()
-        self.assertEqual(list(p.fields.keys()), ['field1', 'field2', 'field4', 'field5', 'field6', 'field3'])
+        self.assertEqual(list(p.fields), ['field1', 'field2', 'field4', 'field5', 'field6', 'field3'])
 
     def test_form_html_attributes(self):
         # Some Field classes have an effect on the HTML attributes of their associated
diff --git a/tests/gis_tests/gdal_tests/test_ds.py b/tests/gis_tests/gdal_tests/test_ds.py
index 5b09032482..7bc48c6824 100644
--- a/tests/gis_tests/gdal_tests/test_ds.py
+++ b/tests/gis_tests/gdal_tests/test_ds.py
@@ -120,11 +120,9 @@ class DataSourceTest(unittest.TestCase):
                     layer.__getitem__(50000)
 
                 if hasattr(source, 'field_values'):
-                    fld_names = source.field_values.keys()
-
                     # Testing `Layer.get_fields` (which uses Layer.__iter__)
-                    for fld_name in fld_names:
-                        self.assertEqual(source.field_values[fld_name], layer.get_fields(fld_name))
+                    for fld_name, fld_value in source.field_values.items():
+                        self.assertEqual(fld_value, layer.get_fields(fld_name))
 
                     # Testing `Layer.__getitem__`.
                     for i, fid in enumerate(source.fids):
@@ -132,8 +130,8 @@ class DataSourceTest(unittest.TestCase):
                         self.assertEqual(fid, feat.fid)
                         # Maybe this should be in the test below, but we might as well test
                         # the feature values here while in this loop.
-                        for fld_name in fld_names:
-                            self.assertEqual(source.field_values[fld_name][i], feat.get(fld_name))
+                        for fld_name, fld_value in source.field_values.items():
+                            self.assertEqual(fld_value[i], feat.get(fld_name))
 
     def test03b_layer_slice(self):
         "Test indexing and slicing on Layers."
@@ -194,7 +192,7 @@ class DataSourceTest(unittest.TestCase):
 
                     # Testing Feature.__iter__
                     for fld in feat:
-                        self.assertIn(fld.name, source.fields.keys())
+                        self.assertIn(fld.name, source.fields)
 
     def test05_geometries(self):
         "Testing Geometries from Data Source Features."
diff --git a/tests/httpwrappers/tests.py b/tests/httpwrappers/tests.py
index 88c32f3b0c..ab7c6ce3ff 100644
--- a/tests/httpwrappers/tests.py
+++ b/tests/httpwrappers/tests.py
@@ -53,6 +53,7 @@ class QueryDictTests(SimpleTestCase):
         q = QueryDict()
         self.assertEqual(q.getlist('foo'), [])
         self.assertNotIn('foo', q)
+        self.assertEqual(list(q), [])
         self.assertEqual(list(q.items()), [])
         self.assertEqual(list(q.lists()), [])
         self.assertEqual(list(q.keys()), [])
@@ -83,6 +84,7 @@ class QueryDictTests(SimpleTestCase):
         self.assertIn('foo', q)
         self.assertNotIn('bar', q)
 
+        self.assertEqual(list(q), ['foo'])
         self.assertEqual(list(q.items()), [('foo', 'bar')])
         self.assertEqual(list(q.lists()), [('foo', ['bar'])])
         self.assertEqual(list(q.keys()), ['foo'])
@@ -143,6 +145,7 @@ class QueryDictTests(SimpleTestCase):
         self.assertEqual(q['foo'], 'another')
         self.assertIn('foo', q)
 
+        self.assertCountEqual(q, ['foo', 'name'])
         self.assertCountEqual(q.items(), [('foo', 'another'), ('name', 'john')])
         self.assertCountEqual(q.lists(), [('foo', ['bar', 'baz', 'another']), ('name', ['john'])])
         self.assertCountEqual(q.keys(), ['foo', 'name'])
@@ -186,6 +189,7 @@ class QueryDictTests(SimpleTestCase):
 
         self.assertIn('vote', q)
         self.assertNotIn('foo', q)
+        self.assertEqual(list(q), ['vote'])
         self.assertEqual(list(q.items()), [('vote', 'no')])
         self.assertEqual(list(q.lists()), [('vote', ['yes', 'no'])])
         self.assertEqual(list(q.keys()), ['vote'])
@@ -697,13 +701,13 @@ class CookieTests(unittest.TestCase):
         """
         A single non-standard cookie name doesn't affect all cookies (#13007).
         """
-        self.assertIn('good_cookie', parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
+        self.assertIn('good_cookie', parse_cookie('good_cookie=yes;bad:cookie=yes'))
 
     def test_repeated_nonstandard_keys(self):
         """
         A repeated non-standard name doesn't affect all cookies (#15852).
         """
-        self.assertIn('good_cookie', parse_cookie('a:=b; a:=c; good_cookie=yes').keys())
+        self.assertIn('good_cookie', parse_cookie('a:=b; a:=c; good_cookie=yes'))
 
     def test_python_cookies(self):
         """
@@ -737,7 +741,7 @@ class CookieTests(unittest.TestCase):
         """
         # Chunks without an equals sign appear as unnamed values per
         # https://bugzilla.mozilla.org/show_bug.cgi?id=169091
-        self.assertIn('django_language', parse_cookie('abc=def; unnamed; django_language=en').keys())
+        self.assertIn('django_language', parse_cookie('abc=def; unnamed; django_language=en'))
         # Even a double quote may be an unamed value.
         self.assertEqual(parse_cookie('a=b; "; c=d'), {'a': 'b', '': '"', 'c': 'd'})
         # Spaces in names and values, and an equals sign in values.
diff --git a/tests/invalid_models_tests/test_models.py b/tests/invalid_models_tests/test_models.py
index 77d180d791..65abd1807d 100644
--- a/tests/invalid_models_tests/test_models.py
+++ b/tests/invalid_models_tests/test_models.py
@@ -14,7 +14,7 @@ def get_max_column_name_length():
     allowed_len = None
     db_alias = None
 
-    for db in settings.DATABASES.keys():
+    for db in settings.DATABASES:
         connection = connections[db]
         max_name_length = connection.ops.max_name_length()
         if max_name_length is None or connection.features.truncates_names:
diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py
index 25098af03c..70ccf2c02d 100644
--- a/tests/lookup/tests.py
+++ b/tests/lookup/tests.py
@@ -136,7 +136,7 @@ class LookupTests(TestCase):
         Author.objects.bulk_create([Author() for i in range(test_range - Author.objects.count())])
         authors = {author.pk: author for author in Author.objects.all()}
         with self.assertNumQueries(expected_num_queries):
-            self.assertEqual(Author.objects.in_bulk(authors.keys()), authors)
+            self.assertEqual(Author.objects.in_bulk(authors), authors)
 
     def test_values(self):
         # values() returns a list of dictionaries instead of object instances --
@@ -207,7 +207,7 @@ class LookupTests(TestCase):
             'id_plus_eight': 'id+8',
         }
         self.assertSequenceEqual(
-            Article.objects.filter(id=self.a1.id).extra(select=data).values(*data.keys()),
+            Article.objects.filter(id=self.a1.id).extra(select=data).values(*data),
             [{
                 'id_plus_one': self.a1.id + 1,
                 'id_plus_two': self.a1.id + 2,
diff --git a/tests/messages_tests/base.py b/tests/messages_tests/base.py
index b80fe6c639..13158d7661 100644
--- a/tests/messages_tests/base.py
+++ b/tests/messages_tests/base.py
@@ -172,7 +172,7 @@ class BaseTests:
             'messages': ['Test message %d' % x for x in range(5)],
         }
         show_url = reverse('show_template_response')
-        for level in self.levels.keys():
+        for level in self.levels:
             add_url = reverse('add_template_response', args=(level,))
             response = self.client.post(add_url, data, follow=True)
             self.assertRedirects(response, show_url)
diff --git a/tests/migrations/test_operations.py b/tests/migrations/test_operations.py
index 7b2608936d..f0d24443a4 100644
--- a/tests/migrations/test_operations.py
+++ b/tests/migrations/test_operations.py
@@ -207,7 +207,7 @@ class OperationTests(OperationTestBase):
         definition = operation.deconstruct()
         self.assertEqual(definition[0], "CreateModel")
         self.assertEqual(definition[1], [])
-        self.assertEqual(sorted(definition[2].keys()), ["fields", "name"])
+        self.assertEqual(sorted(definition[2]), ["fields", "name"])
         # And default manager not in set
         operation = migrations.CreateModel("Foo", fields=[], managers=[("objects", models.Manager())])
         definition = operation.deconstruct()
@@ -430,7 +430,7 @@ class OperationTests(OperationTestBase):
         definition = operation.deconstruct()
         self.assertEqual(definition[0], "CreateModel")
         self.assertEqual(definition[1], [])
-        self.assertEqual(sorted(definition[2].keys()), ["bases", "fields", "name", "options"])
+        self.assertEqual(sorted(definition[2]), ["bases", "fields", "name", "options"])
 
     def test_create_unmanaged_model(self):
         """
diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py
index c85eb2a6fa..6520e54d06 100644
--- a/tests/model_forms/tests.py
+++ b/tests/model_forms/tests.py
@@ -2783,7 +2783,7 @@ class ModelFormInheritanceTests(SimpleTestCase):
                 model = Writer
                 fields = '__all__'
 
-        self.assertEqual(list(ModelForm().fields.keys()), ['name', 'age'])
+        self.assertEqual(list(ModelForm().fields), ['name', 'age'])
 
     def test_field_removal(self):
         class ModelForm(forms.ModelForm):
@@ -2800,13 +2800,13 @@ class ModelFormInheritanceTests(SimpleTestCase):
         class Form2(forms.Form):
             foo = forms.IntegerField()
 
-        self.assertEqual(list(ModelForm().fields.keys()), ['name'])
-        self.assertEqual(list(type('NewForm', (Mixin, Form), {})().fields.keys()), [])
-        self.assertEqual(list(type('NewForm', (Form2, Mixin, Form), {})().fields.keys()), ['foo'])
-        self.assertEqual(list(type('NewForm', (Mixin, ModelForm, Form), {})().fields.keys()), ['name'])
-        self.assertEqual(list(type('NewForm', (ModelForm, Mixin, Form), {})().fields.keys()), ['name'])
-        self.assertEqual(list(type('NewForm', (ModelForm, Form, Mixin), {})().fields.keys()), ['name', 'age'])
-        self.assertEqual(list(type('NewForm', (ModelForm, Form), {'age': None})().fields.keys()), ['name'])
+        self.assertEqual(list(ModelForm().fields), ['name'])
+        self.assertEqual(list(type('NewForm', (Mixin, Form), {})().fields), [])
+        self.assertEqual(list(type('NewForm', (Form2, Mixin, Form), {})().fields), ['foo'])
+        self.assertEqual(list(type('NewForm', (Mixin, ModelForm, Form), {})().fields), ['name'])
+        self.assertEqual(list(type('NewForm', (ModelForm, Mixin, Form), {})().fields), ['name'])
+        self.assertEqual(list(type('NewForm', (ModelForm, Form, Mixin), {})().fields), ['name', 'age'])
+        self.assertEqual(list(type('NewForm', (ModelForm, Form), {'age': None})().fields), ['name'])
 
     def test_field_removal_name_clashes(self):
         """
@@ -2974,7 +2974,7 @@ class FormFieldCallbackTests(SimpleTestCase):
         class InheritedForm(NewForm):
             pass
 
-        for name in NewForm.base_fields.keys():
+        for name in NewForm.base_fields:
             self.assertEqual(
                 type(InheritedForm.base_fields[name].widget),
                 type(NewForm.base_fields[name].widget)
diff --git a/tests/model_formsets/tests.py b/tests/model_formsets/tests.py
index c440631ba7..3245bb3fd9 100644
--- a/tests/model_formsets/tests.py
+++ b/tests/model_formsets/tests.py
@@ -1463,7 +1463,7 @@ class ModelFormsetTest(TestCase):
         # a formset for a Model that has a custom primary key that still needs to be
         # added to the formset automatically
         FormSet = modelformset_factory(ClassyMexicanRestaurant, fields=["tacos_are_yummy"])
-        self.assertEqual(sorted(FormSet().forms[0].fields.keys()), ['tacos_are_yummy', 'the_restaurant'])
+        self.assertEqual(sorted(FormSet().forms[0].fields), ['tacos_are_yummy', 'the_restaurant'])
 
     def test_model_formset_with_initial_model_instance(self):
         # has_changed should compare model instance and primary key
diff --git a/tests/requests/tests.py b/tests/requests/tests.py
index 1ab90660f7..a3eb9632a3 100644
--- a/tests/requests/tests.py
+++ b/tests/requests/tests.py
@@ -21,10 +21,10 @@ from django.utils.timezone import utc
 class RequestsTests(SimpleTestCase):
     def test_httprequest(self):
         request = HttpRequest()
-        self.assertEqual(list(request.GET.keys()), [])
-        self.assertEqual(list(request.POST.keys()), [])
-        self.assertEqual(list(request.COOKIES.keys()), [])
-        self.assertEqual(list(request.META.keys()), [])
+        self.assertEqual(list(request.GET), [])
+        self.assertEqual(list(request.POST), [])
+        self.assertEqual(list(request.COOKIES), [])
+        self.assertEqual(list(request.META), [])
 
         # .GET and .POST should be QueryDicts
         self.assertEqual(request.GET.urlencode(), '')
@@ -76,11 +76,11 @@ class RequestsTests(SimpleTestCase):
             'CONTENT_TYPE': 'text/html; charset=utf8',
             'wsgi.input': BytesIO(b''),
         })
-        self.assertEqual(list(request.GET.keys()), [])
-        self.assertEqual(list(request.POST.keys()), [])
-        self.assertEqual(list(request.COOKIES.keys()), [])
+        self.assertEqual(list(request.GET), [])
+        self.assertEqual(list(request.POST), [])
+        self.assertEqual(list(request.COOKIES), [])
         self.assertEqual(
-            set(request.META.keys()),
+            set(request.META),
             {'PATH_INFO', 'REQUEST_METHOD', 'SCRIPT_NAME', 'CONTENT_TYPE', 'wsgi.input'}
         )
         self.assertEqual(request.META['PATH_INFO'], 'bogus')
diff --git a/tests/servers/test_basehttp.py b/tests/servers/test_basehttp.py
index b508e71c83..83723366ef 100644
--- a/tests/servers/test_basehttp.py
+++ b/tests/servers/test_basehttp.py
@@ -46,7 +46,7 @@ class WSGIRequestHandlerTestCase(SimpleTestCase):
                     self.assertIn('GET A %d' % status_code, messages[0])
 
                     # Incorrect levels shouldn't have any messages.
-                    for wrong_level in level_status_codes.keys():
+                    for wrong_level in level_status_codes:
                         if wrong_level != level:
                             messages = _log_level_code(wrong_level, status_code)
                             self.assertEqual(len(messages), 0)
diff --git a/tests/test_client/views.py b/tests/test_client/views.py
index bc6a59f760..41a5f8518b 100644
--- a/tests/test_client/views.py
+++ b/tests/test_client/views.py
@@ -330,4 +330,4 @@ def django_project_redirect(request):
 
 def upload_view(request):
     """Prints keys of request.FILES to the response."""
-    return HttpResponse(', '.join(request.FILES.keys()))
+    return HttpResponse(', '.join(request.FILES))
diff --git a/tests/user_commands/management/commands/dance.py b/tests/user_commands/management/commands/dance.py
index b86ba6c622..81d6ec9c26 100644
--- a/tests/user_commands/management/commands/dance.py
+++ b/tests/user_commands/management/commands/dance.py
@@ -18,6 +18,6 @@ class Command(BaseCommand):
             raise CommandError()
         if options['verbosity'] > 0:
             self.stdout.write("I don't feel like dancing %s." % options["style"])
-            self.stdout.write(','.join(options.keys()))
+            self.stdout.write(','.join(options))
         if options['integer'] > 0:
             self.stdout.write("You passed %d as a positional argument." % options['integer'])
diff --git a/tests/utils_tests/test_datastructures.py b/tests/utils_tests/test_datastructures.py
index e66210759a..0db21fe5b2 100644
--- a/tests/utils_tests/test_datastructures.py
+++ b/tests/utils_tests/test_datastructures.py
@@ -94,8 +94,8 @@ class MultiValueDictTests(SimpleTestCase):
             'pm': ['Rory'],
         })
         d = mvd.dict()
-        self.assertEqual(sorted(d.keys()), sorted(mvd.keys()))
-        for key in mvd.keys():
+        self.assertEqual(sorted(d), sorted(mvd))
+        for key in mvd:
             self.assertEqual(d[key], mvd[key])
 
         self.assertEqual({}, MultiValueDict().dict())