From 7a95d8fff940cf6affbfef759ec69a5acf92f773 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Thu, 29 Aug 2019 15:55:37 +0100 Subject: Fix encoding for account validity HTML files on Python 2 --- synapse/rest/client/v2_alpha/account_validity.py | 4 +++- tests/rest/client/v2_alpha/test_register.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/synapse/rest/client/v2_alpha/account_validity.py b/synapse/rest/client/v2_alpha/account_validity.py index 8091b78285..98f7c60016 100644 --- a/synapse/rest/client/v2_alpha/account_validity.py +++ b/synapse/rest/client/v2_alpha/account_validity.py @@ -15,6 +15,8 @@ import logging +from six import ensure_binary + from twisted.internet import defer from synapse.api.errors import AuthError, SynapseError @@ -63,7 +65,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(response.encode("utf8")) + request.write(ensure_binary(response)) finish_request(request) defer.returnValue(None) diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py index af1e600591..b28de3663c 100644 --- a/tests/rest/client/v2_alpha/test_register.py +++ b/tests/rest/client/v2_alpha/test_register.py @@ -20,6 +20,7 @@ import json import os from mock import Mock +from six import ensure_binary import pkg_resources @@ -437,7 +438,7 @@ class AccountValidityRenewalByEmailTestCase(unittest.HomeserverTestCase): # Check that the HTML we're getting is the one we expect on a successful renewal. expected_html = self.hs.config.account_validity.account_renewed_html_content self.assertEqual( - channel.result["body"], expected_html.encode("utf8"), channel.result + channel.result["body"], ensure_binary(expected_html), channel.result ) # Move 3 days forward. If the renewal failed, every authed request with @@ -467,7 +468,7 @@ class AccountValidityRenewalByEmailTestCase(unittest.HomeserverTestCase): # invalid/unknown token. expected_html = self.hs.config.account_validity.invalid_token_html_content self.assertEqual( - channel.result["body"], expected_html.encode("utf8"), channel.result + channel.result["body"], ensure_binary(expected_html), channel.result ) def test_manual_email_send(self): -- cgit 1.5.1