Revision: 8217
          http://svn.sourceforge.net/mailman/?rev=8217&view=rev
Author:   bwarsaw
Date:     2007-05-10 10:26:48 -0700 (Thu, 10 May 2007)

Log Message:
-----------
Forward port tkikuchi's r8213 from 2.1:

    base64 codec raises 'AssertionError'. This should not occur in normal case
    but it looks like thare is a buggy MUA or spammer who declairs like so:
    Content-Type: text/plain; charset=base64
    :-(

Modified Paths:
--------------
    branches/exp-elixir-branch/Mailman/Handlers/Scrubber.py

Modified: branches/exp-elixir-branch/Mailman/Handlers/Scrubber.py
===================================================================
--- branches/exp-elixir-branch/Mailman/Handlers/Scrubber.py     2007-05-10 
04:35:37 UTC (rev 8216)
+++ branches/exp-elixir-branch/Mailman/Handlers/Scrubber.py     2007-05-10 
17:26:48 UTC (rev 8217)
@@ -330,7 +330,8 @@
             partcharset = part.get_content_charset('us-ascii')
             try:
                 t = unicode(t, partcharset, 'replace')
-            except (UnicodeError, LookupError, ValueError, TypeError):
+            except (UnicodeError, LookupError, ValueError, TypeError,
+                    AssertionError):
                 # What is the cause to come this exception now ?
                 # Replace funny characters.  We use errors='replace'.
                 u = unicode(t, 'ascii', 'replace')


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to