From 19d9f08506570461788033406ea7f662f3f21aeb Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Mon, 10 May 2010 14:11:45 -0700 Subject: Made a minor change to the removal of an Approved: pseudo-header from a text/html alternative to allow for an inserted '\xA0' before the password. --- Mailman/Handlers/Approve.py | 2 +- NEWS | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Mailman/Handlers/Approve.py b/Mailman/Handlers/Approve.py index ed85395d..68f23cf1 100644 --- a/Mailman/Handlers/Approve.py +++ b/Mailman/Handlers/Approve.py @@ -111,7 +111,7 @@ def process(mlist, msg, msgdata): # line of HTML or other fancy text may include additional message # text. This pattern works with HTML. It may not work with rtf # or whatever else is possible. - pattern = name + ':(\s| )*' + re.escape(passwd) + pattern = name + ':(\xA0|\s| )*' + re.escape(passwd) for part in typed_subpart_iterator(msg, 'text'): if part is not None and part.get_payload() is not None: lines = part.get_payload(decode=True) diff --git a/NEWS b/NEWS index 5bfce3c7..b6cfa280 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,10 @@ Here is a history of user visible changes to Mailman. Bug Fixes and other patches + - Made a minor change to the removal of an Approved: pseudo-header from + a text/html alternative to allow for an inserted '\xA0' before the + password. + - Fixed Content Filtering collapse_alternatives to work on deeply nested multipart/alternative parts. Bug #576675. -- cgit v1.2.3