summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-09-09 16:33:09 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-09-09 16:33:09 +0100
commit6ceaf90e13c019fc55db05f79f47922106d55d63 (patch)
tree01aee45825f45bb24f672c900fb4a6ceb724caab
parentChangelog (diff)
downloadsynapse-6ceaf90e13c019fc55db05f79f47922106d55d63.tar.xz
Revert "Ensure the password reset template is correctly converted to binary"
This reverts commit 665dd9f7f8db2f8d38f454d4d5b96efcf163a5db.
-rw-r--r--synapse/rest/client/v2_alpha/account.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py

index 20e1e01592..32770a4a95 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py
@@ -17,7 +17,6 @@ import logging import re -from six import ensure_binary from six.moves import http_client import jinja2 @@ -296,7 +295,7 @@ class PasswordResetSubmitTokenServlet(RestServlet): ) request.setResponseCode(e.code) - request.write(ensure_binary(html)) + request.write(html.encode('utf-8')) finish_request(request) defer.returnValue(None)