aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2017-12-29 12:55:00 -0800
committerMark Sapiro <mark@msapiro.net>2017-12-29 12:55:00 -0800
commit4199371d91101bba2c60e78ee428d646e0b6698f (patch)
tree289d586c10c62cda9d3a457c67addf9f6cc442e9
parent223590d493d2569ea18dbf0fa8b986cc63cafa30 (diff)
downloadmailman2-4199371d91101bba2c60e78ee428d646e0b6698f.tar.gz
mailman2-4199371d91101bba2c60e78ee428d646e0b6698f.tar.xz
mailman2-4199371d91101bba2c60e78ee428d646e0b6698f.zip
Removed a Python 2.7 dependency from pipermail.py.
-rw-r--r--Mailman/Archiver/pipermail.py4
-rw-r--r--NEWS4
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)