From a46982cee9308294da0fcd99e06a5f1b7a7c439a Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 21 Apr 2017 16:20:12 +0100 Subject: [PATCH] Need the HTTP status code --- synapse/http/client.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/synapse/http/client.py b/synapse/http/client.py index 4458855ce..df8c3e3c2 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -323,7 +323,7 @@ class MatrixProxyClient(object): result = yield self.simpleHttpClient.post_json_get_json(uri, post_json) defer.returnValue(result) except CodeMessageException as cme: - ex = self._tryGetMatrixError(cme.msg) + ex = self._tryGetMatrixError(cme) if ex is not None: raise ex raise cme @@ -334,17 +334,17 @@ class MatrixProxyClient(object): result = yield self.simpleHttpClient.get_json(uri, args) defer.returnValue(result) except CodeMessageException as cme: - ex = self._tryGetMatrixError(cme.msg) + ex = self._tryGetMatrixError(cme) if ex is not None: raise ex raise cme - def _tryGetMatrixError(self, body): + def _tryGetMatrixError(self, codeMessageException): try: - errbody = json.loads(body) + errbody = json.loads(codeMessageException.msg) errcode = errbody['errcode'] errtext = errbody['error'] - return SynapseError(cme.code, errtext, errcode) + return SynapseError(codeMessageException.code, errtext, errcode) except: return None