Merge pull request #469 from Yelp/connection-errors-take-precedence

When catching and converting exceptions, handle connection errors first
Yelp · Oct 27, 2020 · 20921da · 20921da
2 parents a7858f6 + fb8b650
commit 20921da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bravado/http_future.py b/bravado/http_future.py
@@ -122,10 +122,10 @@ def wrapper(self, *args, **kwargs):
 
         try:
             return func(self, *args, **kwargs)
-        except timeout_errors as exception:
-            self.future._raise_timeout_error(exception)
         except connection_errors as exception:
             self.future._raise_connection_error(exception)
+        except timeout_errors as exception:
+            self.future._raise_timeout_error(exception)
 
     return typing.cast(F, wrapper)
 

diff --git a/bravado/requests_client.py b/bravado/requests_client.py
@@ -237,7 +237,7 @@ def build_timeout(
         return timeout
 
     def result(self, timeout=None):
-        # type: (typing.Optional[float]) -> T
+        # type: (typing.Optional[float]) -> requests.Response
         """Blocking call to wait for API response
 
         :param timeout: timeout in seconds to wait for response. Defaults to