diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-30 00:38:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 00:38:21 +0100 |
| commit | dbf6f28d640e5a19b5696ef0c512dbd956580e4f (patch) | |
| tree | e0c6f054408f61288a2ca7d29aec396fb51377ab /synapse/http | |
| parent | Merge pull request #3140 from matrix-org/rav/use_run_in_background (diff) | |
| parent | more bytes strings (diff) | |
| download | synapse-dbf6f28d640e5a19b5696ef0c512dbd956580e4f.tar.xz | |
Merge pull request #3155 from NotAFile/py3-bytes-1
more bytes strings
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/endpoint.py | 2 | ||||
| -rw-r--r-- | synapse/http/server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index 00572c2897..db455e5909 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -286,7 +286,7 @@ def resolve_service(service_name, dns_client=client, cache=SERVER_CACHE, clock=t if (len(answers) == 1 and answers[0].type == dns.SRV and answers[0].payload - and answers[0].payload.target == dns.Name('.')): + and answers[0].payload.target == dns.Name(b'.')): raise ConnectError("Service %s unavailable" % service_name) for answer in answers: diff --git a/synapse/http/server.py b/synapse/http/server.py index 8d632290de..55b9ad5251 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -546,6 +546,6 @@ def _request_user_agent_is_curl(request): b"User-Agent", default=[] ) for user_agent in user_agents: - if "curl" in user_agent: + if b"curl" in user_agent: return True return False |