summary refs log tree commit diff
path: root/synapse/http/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-09-14 16:58:44 +0100
committerGitHub <noreply@github.com>2018-09-14 16:58:44 +0100
commit3e6e94fe9f2f543de923f33ada5cb19f93428ded (patch)
treecab11a3071e6ff10dab205a7f0dd276d60ba5736 /synapse/http/__init__.py
parentMerge pull request #3871 from matrix-org/erikj/in_flight_block_metrics (diff)
parentfix (diff)
downloadsynapse-3e6e94fe9f2f543de923f33ada5cb19f93428ded.tar.xz
Merge pull request #3872 from matrix-org/hawkowl/timeouts-2
timeouts 2: electric boogaloo
Diffstat (limited to 'synapse/http/__init__.py')
-rw-r--r--synapse/http/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/__init__.py b/synapse/http/__init__.py
index 58ef8d3ce4..a3f9e4f67c 100644
--- a/synapse/http/__init__.py
+++ b/synapse/http/__init__.py
@@ -38,12 +38,12 @@ def cancelled_to_request_timed_out_error(value, timeout):
     return value
 
 
-ACCESS_TOKEN_RE = re.compile(br'(\?.*access(_|%5[Ff])token=)[^&]*(.*)$')
+ACCESS_TOKEN_RE = re.compile(r'(\?.*access(_|%5[Ff])token=)[^&]*(.*)$')
 
 
 def redact_uri(uri):
     """Strips access tokens from the uri replaces with <redacted>"""
     return ACCESS_TOKEN_RE.sub(
-        br'\1<redacted>\3',
+        r'\1<redacted>\3',
         uri
     )