Merge pull request #38 from RegioHelden/fix-substitute-error-msg

Fix substitute error msg

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.5.6"
+current_version = "0.5.7"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.5.7 (2024-11-18)
+* `@substitute_error` now shows error message of the original error.
+
 ## 0.5.6 (2024-11-13)
 * Fix `DjangoKafka.run_consumers` failing when there are no consumers in the registry.
 

django_kafka/__init__.py

@@ -18,7 +18,7 @@
 
 logger = logging.getLogger(__name__)
 
-__version__ = "0.5.6"
+__version__ = "0.5.7"
 
 __all__ = [
     "autodiscover",

django_kafka/management/commands/errors.py

@@ -10,6 +10,6 @@ def wrapper(*args, **kwargs):
             try:
                 return func(*args, **kwargs)
             except tuple(errors) as original_error:
-                raise substitution from original_error
+                raise substitution(original_error) from original_error
         return wrapper
     return decorator

django_kafka/tests/connect/test_substitute_error.py

@@ -8,14 +8,18 @@
 
 class SubstituteErrorTestCase(SimpleTestCase):
     def test_substitute(self):
-        class CustomException(Exception):
+        class CustomError(Exception):
             pass
 
-        errors = [ValueError, KeyError, CustomException]
-        decorator = substitute_error(errors, CommandError)
+        errors = {
+            ValueError: "value error",
+            KeyError: "key error",
+            CustomError: "custom error",
+        }
+        decorator = substitute_error(errors.keys(), CommandError)
 
-        for error in errors:
-            func = Mock(side_effect=error)
+        for error, msg in errors.items():
+            func = Mock(side_effect=error(msg))
 
-            with self.assertRaises(CommandError):
+            with self.assertRaisesMessage(CommandError, msg):
                 decorator(func)()

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-kafka"
-version = "0.5.6"
+version = "0.5.7"
 dependencies = [
     "django>=4.0,<6.0",
     "confluent-kafka[avro, schema-registry]==2.4.0"