Account validity: allow defining HTML templates to serve the us… (#5807)

matrix-org · Feb 20, 2020 · 27251db · 27251db
2 parents 7fbc573 + 8ed9e63
commit 27251db
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/synapse/rest/client/v2_alpha/account_validity.py b/synapse/rest/client/v2_alpha/account_validity.py
@@ -67,9 +67,9 @@ def on_GET(self, request):
         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)
-        return None
+        defer.returnValue(None)
 
 
 class AccountValiditySendMailServlet(RestServlet):
@@ -98,7 +98,7 @@ def on_POST(self, request):
         user_id = requester.user.to_string()
         yield self.account_activity_handler.send_renewal_email_to_user(user_id)
 
-        return (200, {})
+        defer.returnValue((200, {}))
 
 
 def register_servlets(hs, http_server):