Return lists from specs_for*

matthiask · matthiask · commit a7b6a79e4d7f · 2023-06-12T12:22:39.000+02:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -9,6 +9,7 @@ Change log
 
 - Fixed the broken argument validation of ``./manage.py f3dumpdata``.
 - Switched to hatchling and ruff.
+- Made ``specs_for_*_models`` helpers return a list instead of a generator.
 
 
 `0.5`_ (2023-03-15)
diff --git a/feincms3_data/data.py b/feincms3_data/data.py
@@ -63,7 +63,7 @@ def _validate_spec(spec):
 
 def specs_for_models(models, spec=None):
     spec = {} if spec is None else spec
-    return (_validate_spec({**spec, "model": cls._meta.label_lower}) for cls in models)
+    return [_validate_spec({**spec, "model": cls._meta.label_lower}) for cls in models]
 
 
 def specs_for_derived_models(cls, spec=None):
diff --git a/tests/testapp/test_data.py b/tests/testapp/test_data.py
@@ -58,7 +58,7 @@ def test_invalid_spec_missing_model(self):
 
     def test_invalid_spec_unknown_keys(self):
         with self.assertRaises(InvalidSpec) as cm:
-            list(specs_for_models([Parent], {"hello": "world"}))
+            specs_for_models([Parent], {"hello": "world"})
         self.assertIn("contains unknown keys: {'hello'}", str(cm.exception))
 
     def test_datasets(self):
@@ -80,15 +80,15 @@ def test_datasets(self):
         )
 
     def test_specs_for_derived_models(self):
-        specs = list(specs_for_derived_models(models.Model))
+        specs = specs_for_derived_models(models.Model)
 
         self.assertIn({"model": "auth.user"}, specs)
         self.assertIn({"model": "testapp.parent"}, specs)
         self.assertIn({"model": "testapp.child1"}, specs)
         self.assertNotIn({"model": "testapp.child"}, specs)
 
     def test_specs_for_app_models(self):
-        specs = list(specs_for_app_models("testapp", {"delete_missing": True}))
+        specs = specs_for_app_models("testapp", {"delete_missing": True})
 
         self.assertCountEqual(
             specs,
@@ -347,7 +347,7 @@ def test_pk_cache(self):
             self.assertEqual(pks(Parent), set())
 
     def test_mappers(self):
-        specs = list(specs_for_app_models("testapp"))
+        specs = specs_for_app_models("testapp")
 
         self.assertCountEqual(
             specs,
@@ -439,7 +439,7 @@ def test_should_delete_in_reverse(self):
         p = Parent.objects.create()
         p.child2_set.create()
 
-        specs = list(specs_for_app_models("testapp", {"delete_missing": True}))
+        specs = specs_for_app_models("testapp", {"delete_missing": True})
         data = json.loads(dump_specs(specs))
 
         # Create a situation where the Child2 has to be deleted before Parent
