summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-04 17:32:44 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-04 17:32:44 +0000
commit6d3e4f4d0aad4ad9b44b28349838ff48aef39440 (patch)
tree2a1b2a8c6675fe85fb5b3da350a2600bd83d0e02 /synapse/http
parentModify API for SimpleHttpClient.get_json and update usages. (diff)
downloadsynapse-6d3e4f4d0aad4ad9b44b28349838ff48aef39440.tar.xz
Update user/alias query APIs to use new format of SimpleHttpClient.get_json
Diffstat (limited to '')
-rw-r--r--synapse/http/client.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 5f4558be47..fee8c901a2 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -113,6 +113,9 @@ class SimpleHttpClient(object):
         if 200 <= response.code < 300:
             defer.returnValue(json.loads(body))
         else:
+            # NB: This is explicitly not json.loads(body)'d because the contract
+            # of CodeMessageException is a *string* message. Callers can always
+            # load it into JSON if they want.
             raise CodeMessageException(response.code, body)