diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-09 23:54:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 23:54:05 +0100 |
| commit | 87478c5a6007b2a21933c1200f2741b6f3d0df3e (patch) | |
| tree | 06221bbafb5a936ea7c19d7ae856b93a7ce3ff2e /synapse/http | |
| parent | Merge pull request #3073 from NotAFile/use-six-reraise (diff) | |
| parent | Add b prefixes to some strings that are bytes in py3 (diff) | |
| download | synapse-87478c5a6007b2a21933c1200f2741b6f3d0df3e.tar.xz | |
Merge pull request #3061 from NotAFile/add-some-byte-strings
Add b prefixes to some strings that are bytes in py3
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/server.py | 4 | ||||
| -rw-r--r-- | synapse/http/site.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 64e083ebfc..8d632290de 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -329,7 +329,7 @@ class JsonResource(HttpServer, resource.Resource): register_paths, so will return (possibly via Deferred) either None, or a tuple of (http code, response body). """ - if request.method == "OPTIONS": + if request.method == b"OPTIONS": return _options_handler, {} # Loop through all the registered callbacks to check if the method @@ -543,7 +543,7 @@ def finish_request(request): def _request_user_agent_is_curl(request): user_agents = request.requestHeaders.getRawHeaders( - "User-Agent", default=[] + b"User-Agent", default=[] ) for user_agent in user_agents: if "curl" in user_agent: diff --git a/synapse/http/site.py b/synapse/http/site.py index e422c8dfae..c8b46e1af2 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -20,7 +20,7 @@ import logging import re import time -ACCESS_TOKEN_RE = re.compile(r'(\?.*access(_|%5[Ff])token=)[^&]*(.*)$') +ACCESS_TOKEN_RE = re.compile(br'(\?.*access(_|%5[Ff])token=)[^&]*(.*)$') class SynapseRequest(Request): @@ -43,12 +43,12 @@ class SynapseRequest(Request): def get_redacted_uri(self): return ACCESS_TOKEN_RE.sub( - r'\1<redacted>\3', + br'\1<redacted>\3', self.uri ) def get_user_agent(self): - return self.requestHeaders.getRawHeaders("User-Agent", [None])[-1] + return self.requestHeaders.getRawHeaders(b"User-Agent", [None])[-1] def started_processing(self): self.site.access_logger.info( |