summary refs log tree commit diff
path: root/synapse/http/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-18 19:02:45 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-18 19:02:45 +0100
commit38ead946a9571f1916228c3d96aad48b6b57ef89 (patch)
treecdc68014a0368b266796c83f78b9a02e41c0fe07 /synapse/http/__init__.py
parenttowncrier (diff)
parentMerge pull request #3879 from matrix-org/matthew/fix-autojoin (diff)
downloadsynapse-38ead946a9571f1916228c3d96aad48b6b57ef89.tar.xz
Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail_links
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
     )