diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-18 13:54:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-18 13:54:27 +0100 |
| commit | 3accee1a8c2804620713ac4ff068a4a18a7de192 (patch) | |
| tree | 5bfad3c1e8653713f8e14062732f892797279a92 /contrib | |
| parent | Merge pull request #2136 from bbigras/patch-1 (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-3accee1a8c2804620713ac4ff068a4a18a7de192.tar.xz | |
Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse v0.21.0
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cmdclient/http.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/contrib/cmdclient/http.py b/contrib/cmdclient/http.py index 4186897316..c833f3f318 100644 --- a/contrib/cmdclient/http.py +++ b/contrib/cmdclient/http.py @@ -36,15 +36,13 @@ class HttpClient(object): the request body. This will be encoded as JSON. Returns: - Deferred: Succeeds when we get *any* HTTP response. - - The result of the deferred is a tuple of `(code, response)`, - where `response` is a dict representing the decoded JSON body. + Deferred: Succeeds when we get a 2xx HTTP response. The result + will be the decoded JSON body. """ pass def get_json(self, url, args=None): - """ Get's some json from the given host homeserver and path + """ Gets some json from the given host homeserver and path Args: url (str): The URL to GET data from. @@ -54,10 +52,8 @@ class HttpClient(object): and *not* a string. Returns: - Deferred: Succeeds when we get *any* HTTP response. - - The result of the deferred is a tuple of `(code, response)`, - where `response` is a dict representing the decoded JSON body. + Deferred: Succeeds when we get a 2xx HTTP response. The result + will be the decoded JSON body. """ pass @@ -214,4 +210,4 @@ class _JsonProducer(object): pass def stopProducing(self): - pass \ No newline at end of file + pass |