Skip to content
Snippets Groups Projects
Unverified Commit f25f638c authored by Brendan Abolivier's avatar Brendan Abolivier
Browse files

Lint

parent 3ff3dfe5
No related branches found
No related tags found
No related merge requests found
......@@ -805,7 +805,7 @@ uploads_path: "DATADIR/uploads"
# # Directory in which Synapse will try to find the HTML files to serve to the
# # user when trying to renew an account. Optional, defaults to
# # synapse/res/templates.
# template_dir: "res/templates"
# template_dir: "res/templates"
# # HTML to be displayed to the user after they successfully renewed their
# # account. Optional.
# account_renewed_html_path: "account_renewed.html"
......
......@@ -14,10 +14,10 @@
# limitations under the License.
import os
import pkg_resources
from distutils.util import strtobool
import pkg_resources
from synapse.config._base import Config, ConfigError
from synapse.types import RoomAlias
from synapse.util.stringutils import random_string_with_symbols
......@@ -54,13 +54,10 @@ class AccountValidityConfig(Config):
template_dir = pkg_resources.resource_filename("synapse", "res/templates")
if "account_renewed_html_path" in config:
file_path = os.path.join(
template_dir, config["account_renewed_html_path"],
)
file_path = os.path.join(template_dir, config["account_renewed_html_path"])
self.account_renewed_html_content = self.read_file(
file_path,
"account_validity.account_renewed_html_path",
file_path, "account_validity.account_renewed_html_path"
)
else:
self.account_renewed_html_content = (
......@@ -68,12 +65,10 @@ class AccountValidityConfig(Config):
)
if "invalid_token_html_path" in config:
file_path = os.path.join(
template_dir, config["invalid_token_html_path"],
)
file_path = os.path.join(template_dir, config["invalid_token_html_path"])
self.invalid_token_html_content = self.read_file(
file_path, "account_validity.invalid_token_html_path",
file_path, "account_validity.invalid_token_html_path"
)
else:
self.invalid_token_html_content = (
......@@ -184,7 +179,7 @@ class RegistrationConfig(Config):
# # Directory in which Synapse will try to find the HTML files to serve to the
# # user when trying to renew an account. Optional, defaults to
# # synapse/res/templates.
# template_dir: "res/templates"
# template_dir: "res/templates"
# # HTML to be displayed to the user after they successfully renewed their
# # account. Optional.
# account_renewed_html_path: "account_renewed.html"
......
......@@ -52,7 +52,7 @@ class AccountValidityRenewServlet(RestServlet):
renewal_token = request.args[b"token"][0]
token_valid = yield self.account_activity_handler.renew_account(
renewal_token.decode("utf8"),
renewal_token.decode("utf8")
)
if token_valid:
......@@ -64,9 +64,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.setHeader(b"Content-Length", b"%d" % (len(response),))
request.write(response.encode("utf8"))
finish_request(request)
defer.returnValue(None)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment