summary refs log tree commit diff
path: root/synapse/api/urls.py
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-10-12 14:49:58 -0600
committerTravis Ralston <travpc@gmail.com>2018-10-12 14:49:58 -0600
commite3586f7c06f3c779e87f9ea3bf4e4ac549a451c9 (patch)
tree2ef1ecdb2f2c6641a81a47adf51fda62343be7e3 /synapse/api/urls.py
parentRemove debugging statement (diff)
parentMake workers work on Py3 (#4027) (diff)
downloadsynapse-e3586f7c06f3c779e87f9ea3bf4e4ac549a451c9.tar.xz
Merge branch 'develop' into travis/fix-federated-group-requests
Diffstat (limited to 'synapse/api/urls.py')
-rw-r--r--synapse/api/urls.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py
index 71347912f1..6d9f1ca0ef 100644
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -64,7 +64,7 @@ class ConsentURIBuilder(object):
         """
         mac = hmac.new(
             key=self._hmac_secret,
-            msg=user_id,
+            msg=user_id.encode('ascii'),
             digestmod=sha256,
         ).hexdigest()
         consent_uri = "%s_matrix/consent?%s" % (