From 4199371d91101bba2c60e78ee428d646e0b6698f Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Fri, 29 Dec 2017 12:55:00 -0800 Subject: Removed a Python 2.7 dependency from pipermail.py. --- Mailman/Archiver/pipermail.py | 4 ++-- NEWS | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Mailman/Archiver/pipermail.py b/Mailman/Archiver/pipermail.py index c03d43b3..9b0813b0 100644 --- a/Mailman/Archiver/pipermail.py +++ b/Mailman/Archiver/pipermail.py @@ -249,8 +249,8 @@ class Article: if date is None: date = floatdate(message.get('x-list-received-date')) if date is None: - date = floatdate(re.sub(r'^.*;\s*', '', - message.get('received', ''), flags=re.S)) + rec_re = re.compile(r'^.*;\s*', re.DOTALL) + date = floatdate(rec_re.sub('', message.get('received', ''))) if date is None: date = floatdate(re.sub(r'From \s*\S+\s+', '', message.get_unixfrom() or '' )) diff --git a/NEWS b/NEWS index 07d50655..9faf7df7 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,10 @@ Here is a history of user visible changes to Mailman. Bug fixes and other patches + - Mailman 2.1.22 introduced a Python 2.7 dependency that could affect + bin/arch processing a message without a valid Date: header. The + dependency has been removed. (LP: #1740543) + - Messages held for header_filter_rules now show the matched regexp in the hold reason. (LP: #1737371) -- cgit v1.2.3