summary refs log tree commit diff
path: root/synapse/http/site.py
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-04-03 20:41:21 +0200
committerAdrian Tschira <nota@notafile.com>2018-04-04 13:48:51 +0200
commit616835187702a0c6f16042e3efb452e1ee3e7826 (patch)
tree88e4de3798a90b18fb2dbe572ba362aa8eaab3c4 /synapse/http/site.py
parentMerge pull request #3049 from matrix-org/rav/use_staticjson (diff)
downloadsynapse-616835187702a0c6f16042e3efb452e1ee3e7826.tar.xz
Add b prefixes to some strings that are bytes in py3
This has no effect on python2

Signed-off-by: Adrian Tschira <nota@notafile.com>
Diffstat (limited to 'synapse/http/site.py')
-rw-r--r--synapse/http/site.py6
1 files changed, 3 insertions, 3 deletions
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(