summary refs log tree commit diff
path: root/synapse/http/site.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-06 00:10:47 +1000
committerGitHub <noreply@github.com>2018-09-06 00:10:47 +1000
commit2d2828dcbc2c6360d28a64d3849cf849eb5348c4 (patch)
treefbf51f97358abe4fc04c9e8c03c7c623ab4ef203 /synapse/http/site.py
parentMerge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings (diff)
downloadsynapse-2d2828dcbc2c6360d28a64d3849cf849eb5348c4.tar.xz
Port http/ to Python 3 (#3771)
Diffstat (limited to 'synapse/http/site.py')
-rw-r--r--synapse/http/site.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py
index 88ed3714f9..f0828c6542 100644
--- a/synapse/http/site.py
+++ b/synapse/http/site.py
@@ -204,14 +204,14 @@ class SynapseRequest(Request):
         self.start_time = time.time()
         self.request_metrics = RequestMetrics()
         self.request_metrics.start(
-            self.start_time, name=servlet_name, method=self.method,
+            self.start_time, name=servlet_name, method=self.method.decode('ascii'),
         )
 
         self.site.access_logger.info(
             "%s - %s - Received request: %s %s",
             self.getClientIP(),
             self.site.site_tag,
-            self.method,
+            self.method.decode('ascii'),
             self.get_redacted_uri()
         )