Avoid raising plain exception

Author: EpicWink

src/cattrs/converters.py

@@ -79,6 +79,7 @@
 )
 from .enums import enum_structure_factory, enum_unstructure_factory
 from .errors import (
+    CattrsError,
     IterableValidationError,
     IterableValidationNote,
     StructureHandlerNotFoundError,
@@ -708,7 +709,7 @@ def _structure_call(obj: Any, cl: type[T]) -> Any:
     @staticmethod
     def _structure_simple_literal(val, type):
         if val not in type.__args__:
-            raise Exception(f"{val} not in literal {type}")
+            raise CattrsError(f"{val} not in literal {type}")
         return val
 
     @staticmethod
@@ -717,7 +718,7 @@ def _structure_enum_literal(val, type):
         try:
             return vals[val]
         except KeyError:
-            raise Exception(f"{val} not in literal {type}") from None
+            raise CattrsError(f"{val} not in literal {type}") from None
 
     def _structure_newtype(self, val: UnstructuredValue, type) -> StructuredValue:
         base = get_newtype_base(type)

src/cattrs/preconf/__init__.py

@@ -5,12 +5,13 @@
 
 from .._compat import is_subclass
 from ..converters import Converter, UnstructureHook
+from ..errors import CattrsError
 from ..fns import identity
 
 
 def validate_datetime(v, _):
     if not isinstance(v, datetime):
-        raise Exception(f"Expected datetime, got {v}")
+        raise CattrsError(f"Expected datetime, got {v}")
     return v
 
 

tests/preconf/test_pyyaml.py

@@ -8,7 +8,7 @@
 from yaml import safe_dump, safe_load
 
 from cattrs._compat import FrozenSetSubscriptable
-from cattrs.errors import ClassValidationError
+from cattrs.errors import CattrsError, ClassValidationError
 from cattrs.preconf.pyyaml import make_converter
 
 from ..test_preconf import Everything, everythings, native_unions
@@ -70,13 +70,15 @@ class A:
     date: 1
     """
 
-    with raises(ClassValidationError if detailed_validation else Exception) as exc_info:
+    with raises(
+        ClassValidationError if detailed_validation else CattrsError
+    ) as exc_info:
         converter.loads(bad_data, A)
 
     if detailed_validation:
         assert (
             repr(exc_info.value.exceptions[0])
-            == "Exception('Expected datetime, got 1')"
+            == "CattrsError('Expected datetime, got 1')"
         )
         assert (
             repr(exc_info.value.exceptions[1]) == "ValueError('Expected date, got 1')"

tests/test_enums.py

@@ -8,6 +8,7 @@
 
 from cattrs import BaseConverter
 from cattrs._compat import Literal
+from cattrs.errors import CattrsError
 
 from .untyped import enums_of_primitives
 
@@ -27,7 +28,7 @@ def test_enum_failure(enum):
     converter = BaseConverter()
     type = Literal[next(iter(enum))]
 
-    with raises(Exception) as exc_info:
+    with raises(CattrsError) as exc_info:
         converter.structure("", type)
 
     assert exc_info.value.args[0] == f" not in literal {type!r}"