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 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'synapse') 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) -- cgit 1.5.1 From 91694227b6133a44457269cd27daecfdbb8d3bec Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Thu, 29 Aug 2019 16:20:21 +0100 Subject: Bump requirement for six to 1.12 --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse') diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 7dfa78dadb..9692f0bf75 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -67,7 +67,7 @@ REQUIREMENTS = [ "pymacaroons>=0.13.0", "msgpack>=0.5.0", "phonenumbers>=8.2.0", - "six>=1.10", + "six>=1.12", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) "prometheus_client>=0.0.18,<0.4.0", -- cgit 1.5.1