aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2011-11-22 16:49:45 -0800
committerMark Sapiro <msapiro@value.net>2011-11-22 16:49:45 -0800
commitf3a329f7968b5f4df0753bb876887432e30225db (patch)
tree85ee820e963adb14dacb1e02a55b524a89bf7f91
parent05dafc005f8dc71aadd8602418f44434cf64a352 (diff)
downloadmailman2-f3a329f7968b5f4df0753bb876887432e30225db.tar.gz
mailman2-f3a329f7968b5f4df0753bb876887432e30225db.tar.xz
mailman2-f3a329f7968b5f4df0753bb876887432e30225db.zip
Changed subject prefixing to allow for possible whitespace between an
'Re' and the following colon when determining how to add the prefix. Bug #893290.
-rw-r--r--Mailman/Handlers/CookHeaders.py4
-rw-r--r--NEWS4
2 files changed, 6 insertions, 2 deletions
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index 3483225e..904f5c3e 100644
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -274,7 +274,7 @@ def prefix_subject(mlist, msg, msgdata):
else:
old_style = mm_cfg.OLD_STYLE_PREFIXING
subject = re.sub(prefix_pattern, '', subject)
- rematch = re.match('((RE|AW|SV|VS)(\[\d+\])?:\s*)+', subject, re.I)
+ rematch = re.match('((RE|AW|SV|VS)\s*(\[\d+\])?\s*:\s*)+', subject, re.I)
if rematch:
subject = subject[rematch.end():]
recolon = 'Re:'
diff --git a/NEWS b/NEWS
index 7a92b287..3c4899fc 100644
--- a/NEWS
+++ b/NEWS
@@ -71,6 +71,10 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Changed subject prefixing to allow for possible whitespace between an
+ 'Re' and the following colon when determining how to add the prefix.
+ Bug #893290.
+
- Fixed a problem where topics regexps would not match RFC 2047 encoded
Keywords: and/or Subject: headers. Bug #891676.