diff options
author | Erik Johnston <erikj@jki.re> | 2018-05-24 16:08:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-24 16:08:57 +0100 |
commit | 46345187cc7fed4137ce8f669d33a6e590dca471 (patch) | |
tree | 0dc10f431ba45079c8adc71dbc898cc374146d52 /synapse/http/matrixfederationclient.py | |
parent | Merge branch 'master' into develop (diff) | |
parent | Replace some more comparisons with six (diff) | |
download | synapse-46345187cc7fed4137ce8f669d33a6e590dca471.tar.xz |
Merge pull request #3243 from NotAFile/py3-six-3
Replace some more comparisons with six
Diffstat (limited to '')
-rw-r--r-- | synapse/http/matrixfederationclient.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 4b2b85464d..4650f43029 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -42,6 +42,8 @@ import random import sys import urllib from six.moves.urllib import parse as urlparse +from six import string_types + logger = logging.getLogger(__name__) outbound_logger = logging.getLogger("synapse.http.outbound") @@ -553,7 +555,7 @@ class MatrixFederationHttpClient(object): encoded_args = {} for k, vs in args.items(): - if isinstance(vs, basestring): + if isinstance(vs, string_types): vs = [vs] encoded_args[k] = [v.encode("UTF-8") for v in vs] @@ -668,7 +670,7 @@ def check_content_type_is_json(headers): RuntimeError if the """ - c_type = headers.getRawHeaders("Content-Type") + c_type = headers.getRawHeaders(b"Content-Type") if c_type is None: raise RuntimeError( "No Content-Type header" @@ -685,7 +687,7 @@ def check_content_type_is_json(headers): def encode_query_args(args): encoded_args = {} for k, vs in args.items(): - if isinstance(vs, basestring): + if isinstance(vs, string_types): vs = [vs] encoded_args[k] = [v.encode("UTF-8") for v in vs] |