Merge branch 'fix-missing-operation-id' into bad-operation-id-to-5xx

connexion/api.py

@@ -243,7 +243,10 @@ def add_paths(self, paths=None):
                     if self.resolver_error_handler is not None:
                         self._add_resolver_error_handler(method, path, err)
                     else:
-                        self._handle_add_operation_error(path, method, sys.exc_info())
+                        exc_info = err.exc_info
+                        if exc_info is None:
+                            exc_info = sys.exc_info()
+                        self._handle_add_operation_error(path, method, exc_info)
                 except Exception:
                     # All other relevant exceptions should be handled as well.
                     self._handle_add_operation_error(path, method, sys.exc_info())

connexion/exceptions.py

@@ -17,12 +17,16 @@ class ConnexionException(Exception):
 
 
 class ResolverError(LookupError):
-    def __init__(self, reason='Unknown reason'):
+    def __init__(self, reason='Unknown reason', exc_info=None):
         """
         :param reason: Reason why the resolver failed.
         :type reason: str
+        :param exc_info: If specified, gives details of the original exception
+            as returned by sys.exc_info()
+        :type exc_info: tuple | None
         """
         self.reason = reason
+        self.exc_info = exc_info
 
     def __str__(self):  # pragma: no cover
         return '<ResolverError: {}>'.format(self.reason)

connexion/resolver.py

@@ -70,10 +70,14 @@ def resolve_function_from_operation_id(self, operation_id):
 
         :type operation_id: str
         """
+        msg = 'Cannot resolve operationId "%s"!' % (operation_id,)
         try:
             return self.function_resolver(operation_id)
-        except (ImportError, AttributeError, ValueError):
-            raise ResolverError('Cannot resolve operationId "%s"!' % (operation_id,))
+        except ImportError:
+            import sys
+            raise ResolverError(msg, sys.exc_info())
+        except (AttributeError, ValueError):
+            raise ResolverError(msg)
 
 
 class RestyResolver(Resolver):

tests/test_api.py

@@ -34,7 +34,7 @@ def test_template():
 
 
 def test_invalid_operation_does_stop_application_to_setup():
-    with pytest.raises(ResolverError):
+    with pytest.raises(ImportError):
         Api(TEST_FOLDER / "fakeapi/op_error_api.yaml", "/api/v1.0",
             {'title': 'OK'})
     with pytest.raises(ResolverError):

tox.ini

@@ -3,7 +3,7 @@ max-line-length=120
 exclude=connexion/__init__.py
 
 [tox]
-envlist=pypy,py27,py34,py35,py35-flask0.10.1,isort-check,flake8
+envlist=py27,py34
 
 [tox:travis]
 pypy=pypy