Update of /cvsroot/mailman/mailman/Mailman
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5585

Modified Files:
      Tag: Release_2_1-maint
        MailList.py 
Log Message:
__load(): Catch unpicking errors too.


Index: MailList.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/MailList.py,v
retrieving revision 2.100.2.13
retrieving revision 2.100.2.14
diff -u -d -r2.100.2.13 -r2.100.2.14
--- MailList.py 19 Feb 2004 04:29:40 -0000      2.100.2.13
+++ MailList.py 29 Feb 2004 16:57:58 -0000      2.100.2.14
@@ -567,7 +567,7 @@
                 if type(dict) <> DictType:
                     return None, 'Load() expected to return a dictionary'
             except (EOFError, ValueError, TypeError, MemoryError,
-                    cPickle.PicklingError), e:
+                    cPickle.PicklingError, cPickle.UnpicklingError), e:
                 return None, e
         finally:
             fp.close()


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

Reply via email to