diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-08-29 15:55:37 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-08-29 16:03:59 +0100 |
| commit | 7a95d8fff940cf6affbfef759ec69a5acf92f773 (patch) | |
| tree | fc45449ee24b38dee1e3a11647122caa020f4f13 /synapse | |
| parent | Merge pull request #5815 from matrix-org/babolivier/dinsic-message-retention (diff) | |
| download | synapse-7a95d8fff940cf6affbfef759ec69a5acf92f773.tar.xz | |
Fix encoding for account validity HTML files on Python 2
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/client/v2_alpha/account_validity.py | 4 |
1 files changed, 3 insertions, 1 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) |