summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-10-02 00:11:58 +1000
committerGitHub <noreply@github.com>2018-10-02 00:11:58 +1000
commit6e05fd032c670080f9e9f99f2e2e8b8eccf24c7d (patch)
tree80b2e221eff35fab33a956fe665ae289527126c3 /synapse
parentMerge pull request #3933 from matrix-org/erikj/destination_retry_cache (diff)
downloadsynapse-6e05fd032c670080f9e9f99f2e2e8b8eccf24c7d.tar.xz
Fix userconsent on Python 3 (#3938)
Diffstat (limited to 'synapse')
-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" % (