Fixed #23968 -- Replaced list comprehension with generators and dict comprehension

6 files changed, 29 insertions, 29 deletions

diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index bdbde46336..9762620afc 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -219,7 +219,7 @@ def caches_setting_for_tests(base=None, **params):
     # This results in the following search order:
     # params -> _caches_setting_base -> base
     base = base or {}
-    setting = dict((k, base.copy()) for k in _caches_setting_base.keys())
+    setting = {k: base.copy() for k in _caches_setting_base.keys()}
     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 de195f4d39..2b00192e2e 100644
--- a/tests/file_uploads/views.py
+++ b/tests/file_uploads/views.py
@@ -92,7 +92,7 @@ def file_upload_echo(request):
     """
     Simple view to echo back info about uploaded files for tests.
     """
-    r = dict((k, f.name) for k, f in request.FILES.items())
+    r = {k: f.name for k, f in request.FILES.items()}
     return HttpResponse(json.dumps(r))
 
 
@@ -100,7 +100,7 @@ def file_upload_echo_content(request):
     """
     Simple view to echo back the content of uploaded files for tests.
     """
-    r = dict((k, f.read().decode('utf-8')) for k, f in request.FILES.items())
+    r = {k: f.read().decode('utf-8') for k, f in request.FILES.items()}
     return HttpResponse(json.dumps(r))
 
 
@@ -153,9 +153,9 @@ def file_upload_content_type_extra(request):
     """
     params = {}
     for file_name, uploadedfile in request.FILES.items():
-        params[file_name] = dict([
-            (k, smart_str(v)) for k, v in uploadedfile.content_type_extra.items()
-        ])
+        params[file_name] = {
+            k: smart_str(v) for k, v in uploadedfile.content_type_extra.items()
+        }
     return HttpResponse(json.dumps(params))
 
 
diff --git a/tests/model_formsets_regress/tests.py b/tests/model_formsets_regress/tests.py
index 761d337e49..8982efed51 100644
--- a/tests/model_formsets_regress/tests.py
+++ b/tests/model_formsets_regress/tests.py
@@ -438,10 +438,10 @@ class FormfieldShouldDeleteFormTests(TestCase):
         # pass standard data dict & see none updated
         data = dict(self.data)
         data['form-INITIAL_FORMS'] = 4
-        data.update(dict(
-            ('form-%d-id' % i, user.pk)
+        data.update({
+            'form-%d-id' % i: user.pk
             for i, user in enumerate(User.objects.all())
-        ))
+        })
         formset = self.NormalFormset(data, queryset=User.objects.all())
         self.assertTrue(formset.is_valid())
         self.assertEqual(len(formset.save()), 0)
@@ -455,10 +455,10 @@ class FormfieldShouldDeleteFormTests(TestCase):
         # create data dict with all fields marked for deletion
         data = dict(self.data)
         data['form-INITIAL_FORMS'] = 4
-        data.update(dict(
-            ('form-%d-id' % i, user.pk)
+        data.update({
+            'form-%d-id' % i: user.pk
             for i, user in enumerate(User.objects.all())
-        ))
+        })
         data.update(self.delete_all_ids)
         formset = self.NormalFormset(data, queryset=User.objects.all())
         self.assertTrue(formset.is_valid())
@@ -474,10 +474,10 @@ class FormfieldShouldDeleteFormTests(TestCase):
         # create data dict with all fields marked for deletion
         data = dict(self.data)
         data['form-INITIAL_FORMS'] = 4
-        data.update(dict(
-            ('form-%d-id' % i, user.pk)
+        data.update({
+            'form-%d-id' % i: user.pk
             for i, user in enumerate(User.objects.all())
-        ))
+        })
         data.update(self.delete_all_ids)
         formset = self.DeleteFormset(data, queryset=User.objects.all())
 
diff --git a/tests/model_meta/test.py b/tests/model_meta/test.py
index cbc348eae3..9901631a70 100644
--- a/tests/model_meta/test.py
+++ b/tests/model_meta/test.py
@@ -497,10 +497,10 @@ TEST_RESULTS = {
 class OptionsBaseTests(test.TestCase):
 
     def _map_rq_names(self, res):
-        return tuple([(o.field.related_query_name(), m) for o, m in res])
+        return tuple((o.field.related_query_name(), m) for o, m in res)
 
     def _map_names(self, res):
-        return tuple([(f.name, m) for f, m in res])
+        return tuple((f.name, m) for f, m in res)
 
 
 class DataTests(OptionsBaseTests):
diff --git a/tests/prefetch_related/tests.py b/tests/prefetch_related/tests.py
index 5fe37d5966..d8d5c19f8e 100644
--- a/tests/prefetch_related/tests.py
+++ b/tests/prefetch_related/tests.py
@@ -653,9 +653,9 @@ class DefaultManagerTests(TestCase):
             # the default manager on teachers to immediately get all the related
             # qualifications, since this will do one query per teacher.
             qs = Department.objects.prefetch_related('teachers')
-            depts = "".join(["%s department: %s\n" %
-                             (dept.name, ", ".join(six.text_type(t) for t in dept.teachers.all()))
-                             for dept in qs])
+            depts = "".join("%s department: %s\n" %
+                            (dept.name, ", ".join(six.text_type(t) for t in dept.teachers.all()))
+                            for dept in qs)
 
             self.assertEqual(depts,
                              "English department: Mr Cleese (BA, BSci, MA, PhD), Mr Idle (BA)\n"
@@ -990,9 +990,9 @@ class MultiDbTests(TestCase):
         # Forward
         qs1 = B.prefetch_related('authors')
         with self.assertNumQueries(2, using='other'):
-            books = "".join(["%s (%s)\n" %
-                             (book.title, ", ".join(a.name for a in book.authors.all()))
-                             for book in qs1])
+            books = "".join("%s (%s)\n" %
+                            (book.title, ", ".join(a.name for a in book.authors.all()))
+                            for book in qs1)
         self.assertEqual(books,
                          "Poems (Charlotte, Anne, Emily)\n"
                          "Jane Eyre (Charlotte)\n"
@@ -1002,9 +1002,9 @@ class MultiDbTests(TestCase):
         # Reverse
         qs2 = A.prefetch_related('books')
         with self.assertNumQueries(2, using='other'):
-            authors = "".join(["%s: %s\n" %
-                               (author.name, ", ".join(b.title for b in author.books.all()))
-                               for author in qs2])
+            authors = "".join("%s: %s\n" %
+                              (author.name, ", ".join(b.title for b in author.books.all()))
+                              for author in qs2)
         self.assertEqual(authors,
                          "Charlotte: Poems, Jane Eyre\n"
                          "Anne: Poems\n"
diff --git a/tests/schema/tests.py b/tests/schema/tests.py
index 730af87abf..4e11c2696a 100644
--- a/tests/schema/tests.py
+++ b/tests/schema/tests.py
@@ -64,13 +64,13 @@ class SchemaTests(TransactionTestCase):
 
     def column_classes(self, model):
         with connection.cursor() as cursor:
-            columns = dict(
-                (d[0], (connection.introspection.get_field_type(d[1], d), d))
+            columns = {
+                d[0]: (connection.introspection.get_field_type(d[1], d), d)
                 for d in connection.introspection.get_table_description(
                     cursor,
                     model._meta.db_table,
                 )
-            )
+            }
         # SQLite has a different format for field_type
         for name, (type, desc) in columns.items():
             if isinstance(type, tuple):