Merge pull request #3 from matrix-org/babolivier/password-reset-template-unicode

Ensure the password reset template is correctly converted to binary

1 files changed, 1 insertions, 3 deletions

diff --git a/synapse/rest/client/v2_alpha/account_validity.py b/synapse/rest/client/v2_alpha/account_validity.py

index 98f7c60016..8091b78285 100644
--- a/synapse/rest/client/v2_alpha/account_validity.py
+++ b/synapse/rest/client/v2_alpha/account_validity.py
@@ -15,8 +15,6 @@
 
 import logging
 
-from six import ensure_binary
-
 from twisted.internet import defer
 
 from synapse.api.errors import AuthError, SynapseError
@@ -65,7 +63,7 @@ class AccountValidityRenewServlet(RestServlet):
         request.setResponseCode(status_code)
         request.setHeader(b"Content-Type", b"text/html; charset=utf-8")
         request.setHeader(b"Content-Length", b"%d" % (len(response),))
-        request.write(ensure_binary(response))
+        request.write(response.encode("utf8"))
         finish_request(request)
         defer.returnValue(None)