Merge pull request #111 from gridsmartercities/fix_exception_handling

Changed exception handling lambda to use isinstance rather than is type

Author: eulogio-gutierrez

aws_lambda_decorators/decorators.py

@@ -136,8 +136,8 @@ def decorator(func):
         def wrapper(*args, **kwargs):
             try:
                 return func(*args, **kwargs)
-            except tuple([handler.exception for handler in handlers]) as ex:  # noqa: pylint - catching-non-exception
-                failed_handler = [handler for handler in handlers if handler.exception is type(ex)][0]
+            except tuple(handler.exception for handler in handlers) as ex:  # noqa: pylint - catching-non-exception
+                failed_handler = [handler for handler in handlers if isinstance(ex, handler.exception)][0]
                 message = failed_handler.friendly_message
 
                 if message and str(ex):

setup.py

@@ -3,7 +3,7 @@
 LONG_DESCRIPTION = open("README.md").read()
 
 setup(name="aws-lambda-decorators",
-      version="0.46",
+      version="0.47",
       description="A set of python decorators to simplify aws python lambda development",
       long_description=LONG_DESCRIPTION,
       long_description_content_type="text/markdown",

tests/test_decorators.py

@@ -459,6 +459,20 @@ def handler():
 
         mock_logger.error.assert_called_once_with("%s: %s", "error", "'blank'")
 
+    @patch("aws_lambda_decorators.decorators.LOGGER")
+    def test_exception_handler_raises_exception_with_inherited_exception(self, mock_logger):
+
+        @handle_exceptions(handlers=[ExceptionHandler(Exception)])
+        def handler():
+            raise KeyError("blank")
+
+        response = handler()
+
+        self.assertEqual(400, response["statusCode"])
+        self.assertTrue("blank" in response["body"])
+
+        mock_logger.error.assert_called_once_with("'blank'")
+
     @patch("aws_lambda_decorators.decorators.LOGGER")
     def test_log_decorator_can_log_params(self, mock_logger):  # noqa: pylint - no-self-use