------------------------------------------------------------
revno: 1105
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Thu 2010-05-06 21:02:51 -0700
message:
  Fixed Content Filtering collapse_alternatives to work on deeply nested
  multipart/alternative parts.  Bug #576675.
modified:
  Mailman/Handlers/MimeDel.py
  NEWS


--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2

Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to 
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'Mailman/Handlers/MimeDel.py'
--- Mailman/Handlers/MimeDel.py	2009-04-18 21:00:43 +0000
+++ Mailman/Handlers/MimeDel.py	2010-05-07 04:02:51 +0000
@@ -185,6 +185,9 @@
                 newpayload.append(firstalt)
             except (IndexError, TypeError):
                 pass
+        elif subpart.is_multipart():
+            collapse_multipart_alternatives(subpart)
+            newpayload.append(subpart)
         else:
             newpayload.append(subpart)
     msg.set_payload(newpayload)

=== modified file 'NEWS'
--- NEWS	2010-04-19 18:38:53 +0000
+++ NEWS	2010-05-07 04:02:51 +0000
@@ -87,8 +87,11 @@
 
   Bug Fixes and other patches
 
+    - Fixed Content Filtering collapse_alternatives to work on deeply nested
+      multipart/alternative parts.  Bug #576675.
+
     - We now accept/remove X-Approved: and X-Approve: headers in addition to
-      Approved: and Approve: for pre-approving posts.  Bug ##557750.
+      Approved: and Approve: for pre-approving posts.  Bug #557750.
 
     - Reordered the 'cancel' and 'subscribe' buttons on the subscription
       confirmation web page so the default action upon 'enter' will be the

_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to