[PATCH v2] Removes potential '//' from email links (#420, #519, #523)

master
Samuel FORESTIER 5 years ago committed by Andrey Arapov
parent c2cd06da52
commit cd49dce78f
Signed by: arno
GPG Key ID: 9076D5E6B31AE99C

@ -76,7 +76,14 @@ class SMTP(object):
self.isso = isso
self.conf = isso.conf.section("smtp")
self.public_endpoint = isso.conf.get("server", "public-endpoint") or local("host")
self.public_endpoint = isso.conf.get("server", "public-endpoint")
# rstrips potential trailing '/', without having to `repr` the `local` object.
if self.public_endpoint:
if self.public_endpoint.endswith('/'):
self.public_endpoint = self.public_endpoint.rstrip('/')
else:
self.public_endpoint = local("host")
self.admin_notify = any((n in ("smtp", "SMTP")) for n in isso.conf.getlist("general", "notify"))
self.reply_notify = isso.conf.getboolean("general", "reply-notifications")

Loading…
Cancel
Save