------------------------------------------------------------
revno: 1053
committer: Mark Sapiro <[email protected]>
branch nick: 2.2
timestamp: Sat 2009-04-18 14:00:43 -0700
message:
  Caught a potential TypeError in MimeDel with certain malformed messages.
modified:
  Mailman/Handlers/MimeDel.py
  NEWS

=== modified file 'Mailman/Handlers/MimeDel.py'
--- Mailman/Handlers/MimeDel.py 2007-10-05 02:52:04 +0000
+++ Mailman/Handlers/MimeDel.py 2009-04-18 21:00:43 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 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
@@ -183,7 +183,7 @@
             try:
                 firstalt = subpart.get_payload(0)
                 newpayload.append(firstalt)
-            except IndexError:
+            except (IndexError, TypeError):
                 pass
         else:
             newpayload.append(subpart)

=== modified file 'NEWS'
--- NEWS        2009-04-18 20:02:57 +0000
+++ NEWS        2009-04-18 21:00:43 +0000
@@ -44,6 +44,10 @@
 
   Bug fixes and other patches
 
+    - Caught a TypeError in content filtering, collapse alternatives that
+      occurred with a malformed message if a multipart/alternative part
+      wasn't multi-part.  Reported in comments to bug #266230.
+
     - Added "If you are a list member" qualification to some messages from the
       options login page.  Bug #266442.
 



--
Active development version (web u/i update)
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.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to