Remove unnecessary generator

kolibri/core/auth/models.py

@@ -646,7 +646,7 @@ def validate_birth_year(value):
         raise ValidationError(error)
 
 
-role_kinds_set = set(r[0] for r in role_kinds.choices)
+role_kinds_set = {r[0] for r in role_kinds.choices}
 
 
 def validate_role_kinds(kinds):

kolibri/core/auth/test/test_bulk_export.py

@@ -122,7 +122,7 @@ def get_data_from_csv_file(self):
         else:
             csv_file = open(self.filepath, "r", newline="")
         with csv_file as f:
-            results = list(row for row in csv.DictReader(f))
+            results = [row for row in csv.DictReader(f)]
         return results
 
     def test_csv_file(self):

kolibri/core/auth/test/test_models.py

@@ -297,12 +297,12 @@ def setUpTestData(cls):
 
     def test_get_learner_groups(self):
         self.assertSetEqual(
-            {self.lg.pk}, set(lg.pk for lg in self.cr.get_learner_groups())
+            {self.lg.pk}, {lg.pk for lg in self.cr.get_learner_groups()}
         )
 
     def test_get_classrooms(self):
         self.assertSetEqual(
-            {self.cr.pk}, set(cr.pk for cr in self.facility.get_classrooms())
+            {self.cr.pk}, {cr.pk for cr in self.facility.get_classrooms()}
         )
 
     def test_get_classroom(self):

kolibri/core/auth/test/test_user_export.py

@@ -58,7 +58,7 @@ def test_csv_export_with_demographics(self):
         )
         csv_file = open_csv_for_reading(filepath)
         with csv_file as f:
-            results = list(row for row in csv.DictReader(f))
+            results = [row for row in csv.DictReader(f)]
 
         for row in results:
             user = next(
@@ -90,7 +90,7 @@ def test_csv_export_no_demographics(self):
         )
         csv_file = open_csv_for_reading(filepath)
         with csv_file as f:
-            results = list(row for row in csv.DictReader(f))
+            results = [row for row in csv.DictReader(f)]
 
         self.assertEqual(len(results), expected_count)
         for demo_field in DEMO_FIELDS:
@@ -111,7 +111,7 @@ def test_csv_export_user_in_multiple_classes(self):
         )
         csv_file = open_csv_for_reading(filepath)
         with csv_file as f:
-            results = list(row for row in csv.DictReader(f))
+            results = [row for row in csv.DictReader(f)]
 
         self.assertEqual(len(results), 2)
 
@@ -129,7 +129,7 @@ def test_csv_export_user_in_one_class_one_group(self):
         )
         csv_file = open_csv_for_reading(filepath)
         with csv_file as f:
-            results = list(row for row in csv.DictReader(f))
+            results = [row for row in csv.DictReader(f)]
 
         self.assertEqual(len(results), 2)
 

kolibri/core/auth/test/test_user_import.py

@@ -293,7 +293,7 @@ def test_import_from_export_missing_headers(self):
         csv_file = open_csv_for_reading(self.csvpath)
         with csv_file as source:
             reader = csv.DictReader(source)
-            rows = list(row for row in reader)
+            rows = [row for row in reader]
         csv_file = open_csv_for_writing(self.csvpath)
         with csv_file as result:
             writer = csv.DictWriter(
@@ -324,7 +324,7 @@ def test_import_from_export_mixed_headers(self):
         csv_file = open_csv_for_reading(self.csvpath)
         with csv_file as source:
             reader = csv.DictReader(source)
-            rows = list(row for row in reader)
+            rows = [row for row in reader]
         csv_file = open_csv_for_writing(self.csvpath)
         with csv_file as result:
             writer = csv.DictWriter(

kolibri/core/content/test/test_content_app.py

@@ -1376,7 +1376,7 @@ def _create_session_logs(self):
     def test_popular(self):
         expected_content_ids = self._create_session_logs()
         response = self.client.get(reverse("kolibri:core:contentnode-popular"))
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def test_popular_no_coach_content(self):
@@ -1389,7 +1389,7 @@ def test_popular_no_coach_content(self):
             reverse("kolibri:core:contentnode-popular"),
             data={"include_coach_content": False},
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def test_popular_coach_has_coach_content(self):
@@ -1406,7 +1406,7 @@ def test_popular_coach_has_coach_content(self):
             reverse("kolibri:core:contentnode-popular"),
             data={"include_coach_content": True},
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def test_popular_ten_minute_cache(self):
@@ -1456,7 +1456,7 @@ def test_resume(self):
         response = self.client.get(
             reverse("kolibri:core:contentnode-resume", kwargs={"pk": user.id})
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def test_resume_wrong_id(self):
@@ -1496,7 +1496,7 @@ def test_next_steps_prereq(self):
         response = self.client.get(
             reverse("kolibri:core:contentnode-next-steps", kwargs={"pk": user.id})
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def test_next_steps_prereq_zero_cache(self):
@@ -1568,7 +1568,7 @@ def test_next_steps_prereq_in_progress(self):
         response = self.client.get(
             reverse("kolibri:core:contentnode-next-steps", kwargs={"pk": user.id})
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def test_next_steps_prereq_coach_content_not_coach(self):
@@ -1592,7 +1592,7 @@ def test_next_steps_prereq_coach_content_not_coach(self):
         response = self.client.get(
             reverse("kolibri:core:contentnode-next-steps", kwargs={"pk": user.id})
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(), response_content_ids)
 
     def test_next_steps_prereq_coach_content_coach(self):
@@ -1618,7 +1618,7 @@ def test_next_steps_prereq_coach_content_coach(self):
         response = self.client.get(
             reverse("kolibri:core:contentnode-next-steps", kwargs={"pk": user.id})
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def test_next_steps_sibling(self):
@@ -1643,7 +1643,7 @@ def test_next_steps_sibling(self):
         response = self.client.get(
             reverse("kolibri:core:contentnode-next-steps", kwargs={"pk": user.id})
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def test_next_steps_sibling_in_progress(self):
@@ -1676,7 +1676,7 @@ def test_next_steps_sibling_in_progress(self):
         response = self.client.get(
             reverse("kolibri:core:contentnode-next-steps", kwargs={"pk": user.id})
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def test_next_steps_sibling_coach_content_not_coach(self):
@@ -1702,7 +1702,7 @@ def test_next_steps_sibling_coach_content_not_coach(self):
         response = self.client.get(
             reverse("kolibri:core:contentnode-next-steps", kwargs={"pk": user.id})
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(), response_content_ids)
 
     def test_next_steps_sibling_coach_content_coach(self):
@@ -1730,7 +1730,7 @@ def test_next_steps_sibling_coach_content_coach(self):
         response = self.client.get(
             reverse("kolibri:core:contentnode-next-steps", kwargs={"pk": user.id})
         )
-        response_content_ids = set(node["content_id"] for node in response.json())
+        response_content_ids = {node["content_id"] for node in response.json()}
         self.assertSetEqual(set(expected_content_ids), response_content_ids)
 
     def tearDown(self):

kolibri/core/content/utils/upgrade.py

@@ -273,10 +273,10 @@ def get_new_resources_available_for_import(destination, channel_id):
         )
     )
 
-    new_resource_node_ids = list(
+    new_resource_node_ids = [
         coerce_key(c[0])
         for c in connection.execute(new_resource_node_ids_statement).fetchall()
-    )
+    ]
 
     trans.rollback()
 
@@ -337,10 +337,10 @@ def get_new_resources_available_for_import(destination, channel_id):
         .distinct()
     )
 
-    new_resource_content_ids = list(
+    new_resource_content_ids = [
         coerce_key(c[0])
         for c in connection.execute(new_resource_content_ids_statement).fetchall()
-    )
+    ]
 
     trans.rollback()
 

kolibri/core/discovery/test/test_filesystem_utils.py

@@ -144,7 +144,7 @@ def setUp(self):
 
     def test_drive_list_members(self):
         self.assertSetEqual(
-            set(drive.path for drive in self.drives.values()), set(["C:\\", "D:\\"])
+            {drive.path for drive in self.drives.values()}, set(["C:\\", "D:\\"])
         )
 
     def test_drive_writability(self):
@@ -185,7 +185,7 @@ def setUp(self):
 
     def test_drive_list_members(self):
         self.assertSetEqual(
-            set(drive.path for drive in self.drives.values()),
+            {drive.path for drive in self.drives.values()},
             set(["/media/user/F571-7814", "/", "/media/user/disk"]),
         )
 
@@ -230,7 +230,7 @@ def setUp(self):
 
     def test_drive_list_members(self):
         self.assertSetEqual(
-            set(drive.path for drive in self.drives.values()),
+            {drive.path for drive in self.drives.values()},
             set(["/Volumes/HP v125w", "/"]),
         )
 

kolibri/core/exams/serializers.py

@@ -153,7 +153,7 @@ def update(self, instance, validated_data):  # noqa
                     collection__kind=ADHOCLEARNERSGROUP
                 ).values_list("collection__id", flat=True)
             )
-            new_group_ids = set(x.id for x in collections)
+            new_group_ids = {x.id for x in collections}
 
             for cid in new_group_ids - current_group_ids:
                 collection = Collection.objects.get(id=cid)
@@ -199,7 +199,7 @@ def _update_learner_ids(self, instance, learners):
                     collection=adhoc_group_assignment.collection
                 ).values_list("user_id", flat=True)
                 original_learner_ids_set = set(original_learner_ids)
-                learner_ids_set = set(learner.id for learner in learners)
+                learner_ids_set = {learner.id for learner in learners}
                 if original_learner_ids_set != learner_ids_set:
                     # Only bother to do anything if these are different
                     new_learner_ids = learner_ids_set - original_learner_ids_set

kolibri/core/lessons/serializers.py

@@ -136,7 +136,7 @@ def update(self, instance, validated_data):
                     collection__kind=ADHOCLEARNERSGROUP
                 ).values_list("collection__id", flat=True)
             )
-            new_group_ids = set(x.id for x in collections)
+            new_group_ids = {x.id for x in collections}
 
             for cid in set(new_group_ids) - set(current_group_ids):
                 collection = Collection.objects.get(id=cid)
@@ -184,7 +184,7 @@ def _update_learner_ids(self, instance, learners):
                     collection=adhoc_group_assignment.collection
                 ).values_list("user_id", flat=True)
                 original_learner_ids_set = set(original_learner_ids)
-                learner_ids_set = set(learner.id for learner in learners)
+                learner_ids_set = {learner.id for learner in learners}
                 if original_learner_ids_set != learner_ids_set:
                     # Only bother to do anything if these are different
                     new_learner_ids = learner_ids_set - original_learner_ids_set

kolibri/core/webpack/hooks.py

@@ -137,7 +137,7 @@ def bundle(self):
         for f in self._stats_file_content["files"]:
             filename = f["name"]
             if not getattr(settings, "DEVELOPER_MODE", False):
-                if any(list(regex.match(filename) for regex in IGNORE_PATTERNS)):
+                if any([regex.match(filename) for regex in IGNORE_PATTERNS]):
                     continue
             relpath = "{0}/{1}".format(self.unique_id, filename)
             if getattr(settings, "DEVELOPER_MODE", False):

kolibri/plugins/learn/viewsets.py

@@ -46,9 +46,9 @@ def consolidate(self, items, queryset):
         )
         lesson_content_ids = set()
         for lesson in lessons:
-            lesson_content_ids |= set(
-                (resource["content_id"] for resource in lesson["resources"])
-            )
+            lesson_content_ids |= {
+                resource["content_id"] for resource in lesson["resources"]
+            }
 
         progress_map = {
             l["content_id"]: l["progress"]

packages/kolibri-tools/lib/i18n/crowdin.py

@@ -124,9 +124,9 @@ def crowdin_files(branch, details):
     if no_crowdin_branch(branch, details):
         return set()
     branch_node = next(node for node in details["files"] if node["name"] == branch)
-    return set(
+    return {
         node["name"] for node in branch_node["files"] if node["node_type"] == "file"
-    )
+    }
 
 
 def is_string_file(file_name):
@@ -431,11 +431,11 @@ def upload_sources(branch, project, key, login, locale_data_folder):
         r = requests.post(ADD_BRANCH_URL)
         r.raise_for_status()
 
-    source_files = set(
+    source_files = {
         file_name
         for file_name in os.listdir(utils.local_locale_source_path(locale_data_folder))
         if is_string_file(file_name)
-    )
+    }
 
     current_files = crowdin_files(branch, details)
     to_add = source_files.difference(current_files)