Construct error message inside of error instead of outside

matrix-org · Oct 25, 2017 · 3982688 · 3982688
1 parent 10db977
commit 3982688
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/matrix_client/api.py b/matrix_client/api.py
@@ -594,9 +594,7 @@ def _send(self, method, path, content=None, query_params={}, headers={},
                     verify=self.validate_cert
                 )
             except requests.exceptions.RequestException as e:
-                raise MatrixHttpLibError(
-                    "Something went wrong in {} requesting {}".format(method, endpoint), e
-                )
+                raise MatrixHttpLibError(e, method, endpoint)
 
             if response.status_code == 429:
                 sleep(response.json()['retry_after_ms'] / 1000)

diff --git a/matrix_client/errors.py b/matrix_client/errors.py
@@ -23,6 +23,8 @@ def __init__(self, code=0, content=""):
 class MatrixHttpLibError(MatrixError):
     """The library used for http requests raised an exception."""
 
-    def __init__(self, msg, original_exception):
-        super(MatrixHttpLibError, self).__init__(msg + ": {}".format(original_exception))
+    def __init__(self, original_exception, method, endpoint):
+        super(MatrixHttpLibError, self).__init__(
+            "Something went wrong in {} requesting {}: {}".format(original_exception)
+        )
         self.original_exception = original_exception