Appease ruff

matthiask · matthiask · commit 341986d0a3ee · 2023-06-12T12:24:41.000+02:00
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,6 +10,9 @@ 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.
+- Changed the ``assert`` statement for checking the dump version into a
+  ``raise`` statement since assertions could be optimized out.
+- Renamed ``InvalidSpec`` to ``InvalidSpecError`` to make ruff happier.
 
 
 `0.5`_ (2023-03-15)
diff --git a/feincms3_data/data.py b/feincms3_data/data.py
@@ -42,7 +42,7 @@ class InvalidVersionError(Exception):
     pass
 
 
-class InvalidSpec(Exception):
+class InvalidSpecError(Exception):
     pass
 
 
@@ -59,9 +59,9 @@ class InvalidSpec(Exception):
 
 def _validate_spec(spec):
     if "model" not in spec:
-        raise InvalidSpec(f"The spec {spec!r} requires a 'model' key")
+        raise InvalidSpecError(f"The spec {spec!r} requires a 'model' key")
     if unknown := (set(spec.keys()) - _valid_keys):
-        raise InvalidSpec(f"The spec {spec!r} contains unknown keys: {unknown!r}")
+        raise InvalidSpecError(f"The spec {spec!r} contains unknown keys: {unknown!r}")
     return spec
 
 
diff --git a/tests/testapp/test_data.py b/tests/testapp/test_data.py
@@ -4,7 +4,7 @@
 from django.test import TransactionTestCase
 
 from feincms3_data.data import (
-    InvalidSpec,
+    InvalidSpecError,
     InvalidVersionError,
     _validate_spec,
     datasets,
@@ -53,12 +53,12 @@ def related_names():
 
 class DataTest(TransactionTestCase):
     def test_invalid_spec_missing_model(self):
-        with self.assertRaises(InvalidSpec) as cm:
+        with self.assertRaises(InvalidSpecError) as cm:
             _validate_spec({})
         self.assertIn("requires a 'model' key", str(cm.exception))
 
     def test_invalid_spec_unknown_keys(self):
-        with self.assertRaises(InvalidSpec) as cm:
+        with self.assertRaises(InvalidSpecError) as cm:
             specs_for_models([Parent], {"hello": "world"})
         self.assertIn("contains unknown keys: {'hello'}", str(cm.exception))
 
@@ -394,7 +394,7 @@ def test_invalid_dumps(self):
         with self.assertRaises(InvalidVersionError):
             load_dump({"version": -1})
 
-        with self.assertRaises(InvalidSpec):
+        with self.assertRaises(InvalidSpecError):
             load_dump(
                 {
                     "version": 1,
