Merge 99c1d8b into a7858f6

Yelp · Oct 25, 2020 · e450aa6 · e450aa6
2 parents a7858f6 + 99c1d8b
commit e450aa6
Show file tree

Hide file tree

Showing 2 changed files with 4 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
@@ -4,6 +4,7 @@
 
 import requests.auth
 import requests.exceptions
+import requests
 import six
 import typing
 from bravado_core.operation import Operation
@@ -237,7 +238,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