From 74f050981cd4dca57451ea74a1ec4a8b3dba153f Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Fri, 8 Nov 2019 13:51:55 -0800 Subject: Fix possible UnicodeDecodeError in sending subscription confirmation. --- Mailman/MailList.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Mailman') diff --git a/Mailman/MailList.py b/Mailman/MailList.py index b85b1427..12d75aff 100644 --- a/Mailman/MailList.py +++ b/Mailman/MailList.py @@ -969,8 +969,9 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, cookie = self.pend_new(Pending.SUBSCRIPTION, userdesc) # Send the user the confirmation mailback if remote is None: - by = remote = '' + oremote = by = remote = '' else: + oremote = remote by = ' ' + remote remote = _(' from %(remote)s') @@ -997,7 +998,7 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin, msg['Reply-To'] = self.GetRequestEmail(cookie) # Is this confirmation a reply to an email subscribe from this # address? - if remote.lower().endswith(email.lower()): + if oremote.lower().endswith(email.lower()): autosub = 'auto-replied' else: autosub = 'auto-generated' -- cgit v1.2.3