diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-03-27 22:54:42 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-03-27 22:54:42 +0100 |
| commit | d9d48aad2d58deb5db422a5373a4dac9334a0618 (patch) | |
| tree | 63e51372ca9ace4971403928bd46440ff9e455e2 /synapse/http/client.py | |
| parent | initial WIP of a tentative preview_url endpoint - incomplete, untested, exper... (diff) | |
| parent | typo (diff) | |
| download | synapse-d9d48aad2d58deb5db422a5373a4dac9334a0618.tar.xz | |
Merge branch 'develop' into matthew/preview_urls
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 25d319f126..127690e534 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -103,7 +103,7 @@ class SimpleHttpClient(object): # TODO: Do we ever want to log message contents? logger.debug("post_urlencoded_get_json args: %s", args) - query_bytes = urllib.urlencode(args, True) + query_bytes = urllib.urlencode(encode_urlencode_args(args), True) response = yield self.request( "POST", @@ -330,7 +330,7 @@ class CaptchaServerHttpClient(SimpleHttpClient): @defer.inlineCallbacks def post_urlencoded_get_raw(self, url, args={}): - query_bytes = urllib.urlencode(args, True) + query_bytes = urllib.urlencode(encode_urlencode_args(args), True) response = yield self.request( "POST", @@ -350,6 +350,19 @@ class CaptchaServerHttpClient(SimpleHttpClient): defer.returnValue(e.response) +def encode_urlencode_args(args): + return {k: encode_urlencode_arg(v) for k, v in args.items()} + + +def encode_urlencode_arg(arg): + if isinstance(arg, unicode): + return arg.encode('utf-8') + elif isinstance(arg, list): + return [encode_urlencode_arg(i) for i in arg] + else: + return arg + + def _print_ex(e): if hasattr(e, "reasons") and e.reasons: for ex in e.reasons: |