OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix get_json

pull/2147/head
David Baker 2017-04-26 10:07:01 +01:00
parent 1a9255c12e
commit c366276056
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/http/client.py
View File

@ -169,12 +169,11 @@ class SimpleHttpClient(object):
On a non-2xx HTTP response. The response body will be used as the On a non-2xx HTTP response. The response body will be used as the
error message. error message.
""" """
body = yield self.get_raw(uri, args) try:
body = yield self.get_raw(uri, args)
if 200 <= response.code < 300:
defer.returnValue(json.loads(body)) defer.returnValue(json.loads(body))
else: except CodeMessageException as e:
raise self._exceptionFromFailedRequest(response, body) raise self._exceptionFromFailedRequest(e.code, e.msg)
@defer.inlineCallbacks @defer.inlineCallbacks
def put_json(self, uri, json_body, args={}): def put_json(self, uri, json_body, args={}):