Adding request timeout

matrix_client/api.py

@@ -16,7 +16,7 @@
 import json
 import requests
 from time import time, sleep
-from .errors import MatrixError, MatrixRequestError
+from .errors import MatrixError, MatrixRequestError, MatrixTimeoutError
 
 try:
     from urllib import quote
@@ -582,16 +582,24 @@ def _send(self, method, path, content=None, query_params={}, headers={},
 
         if headers["Content-Type"] == "application/json" and content is not None:
             content = json.dumps(content)
+
+        request_timeout = 30 + query_params.get("timeout", 30000) / 1000
 
         response = None
         while True:
-            response = requests.request(
-                method, endpoint,
-                params=query_params,
-                data=content,
-                headers=headers,
-                verify=self.validate_cert
-            )
+            try:
+                response = requests.request(
+                    method, endpoint,
+                    params=query_params,
+                    data=content,
+                    headers=headers,
+                    verify=self.validate_cert,
+                    timeout=request_timeout
+                )
+            except requests.exceptions.ReadTimeout:
+                raise MatrixTimeoutError(
+                    "A timeout occured while waiting for response"
+                    )
 
             if response.status_code == 429:
                 sleep(response.json()['retry_after_ms'] / 1000)

matrix_client/errors.py

@@ -4,16 +4,23 @@ class MatrixError(Exception):
 
 
 class MatrixUnexpectedResponse(MatrixError):
-    """The home server gave an unexpected response. """
+    """The home server gave an unexpected response."""
     def __init__(self, content=""):
         super(MatrixError, self).__init__(content)
         self.content = content
 
 
 class MatrixRequestError(MatrixError):
-    """ The home server returned an error response. """
+    """The home server returned an error response."""
 
     def __init__(self, code=0, content=""):
         super(MatrixRequestError, self).__init__("%d: %s" % (code, content))
         self.code = code
         self.content = content
+
+
+class MatrixTimeoutError(MatrixError):
+    """A timeout occured while waiting for an answer."""
+
+    def __init__(self, msg=""):
+        super(MatrixTimeoutError, self).__init__(msg)