From 2b075fb03a704865a759693989127cd5800e7fe6 Mon Sep 17 00:00:00 2001
From: hera <matrix@hera.matrix.org>
Date: Thu, 8 Nov 2018 11:03:08 +0000
Subject: [PATCH] Fix encoding error for consent form on python3

The form was rendering this as "b'01234....'".

-- richvdh
---
 synapse/rest/consent/consent_resource.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/synapse/rest/consent/consent_resource.py b/synapse/rest/consent/consent_resource.py
index e0f7de5d5..8009b7ff1 100644
--- a/synapse/rest/consent/consent_resource.py
+++ b/synapse/rest/consent/consent_resource.py
@@ -160,7 +160,9 @@ class ConsentResource(Resource):
         try:
             self._render_template(
                 request, "%s.html" % (version,),
-                user=username, userhmac=userhmac, version=version,
+                user=username,
+                userhmac=userhmac.decode('ascii'),
+                version=version,
                 has_consented=has_consented, public_version=public_version,
             )
         except TemplateNotFound: