From c3662760566a7cdf48442d399fbffb9163590dc5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 26 Apr 2017 10:07:01 +0100 Subject: [PATCH] Fix get_json --- synapse/http/client.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/synapse/http/client.py b/synapse/http/client.py index 57a49b282..6e0ddfa0f 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -169,12 +169,11 @@ class SimpleHttpClient(object): On a non-2xx HTTP response. The response body will be used as the error message. """ - body = yield self.get_raw(uri, args) - - if 200 <= response.code < 300: + try: + body = yield self.get_raw(uri, args) defer.returnValue(json.loads(body)) - else: - raise self._exceptionFromFailedRequest(response, body) + except CodeMessageException as e: + raise self._exceptionFromFailedRequest(e.code, e.msg) @defer.inlineCallbacks def put_json(self, uri, json_body, args={}):