CVS: tmda/TMDA Pending.py,1.23,1.24 ChangeLog,1.299,1.300

Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1:/tmp/cvs-serv14648

Modified Files:
	Pending.py ChangeLog 
Log Message:
Discard last change.  tmda-cgi wants to display MIME parts.


Index: Pending.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Pending.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Pending.py	5 Dec 2003 22:53:02 -0000	1.23
+++ Pending.py	6 Dec 2003 01:31:46 -0000	1.24
@@ -421,7 +421,10 @@
         self.msgfile = os.path.join(Defaults.PENDING_DIR, self.msgid)
         if not os.path.exists(self.msgfile):
             raise Errors.MessageError, '%s not found!' % self.msgid
-        self.msgobj = Util.msg_from_file(open(self.msgfile, 'r'))
+        try:
+            self.msgobj = email.message_from_file(open(self.msgfile, 'r'))
+        except email.Errors.BoundaryError:
+            self.msgobj = Util.msg_from_file(open(self.msgfile, 'r'))
         self.recipient = recipient
 
     def initMessage(self, recipient = None):

Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- ChangeLog	5 Dec 2003 22:53:02 -0000	1.299
+++ ChangeLog	6 Dec 2003 01:31:46 -0000	1.300
@@ -1,9 +1,3 @@
-2003-12-05  Tim Legant  <[email protected]>
-
-	* Pending.py (Message.__init__): Always create message object
-	using Util.msg_from_file.  This prevents email.Parser.Parser bug
-	846938 from manifesting.
-
 2003-12-03  Jason R. Mastaler  <[email protected]>
 
 	* AutoResponse.py (AutoResponse.create): Add an RFC 2183