SF.net SVN: tmda: [2083] trunk/tmda/TMDA/Util.py

Revision: 2083
          http://svn.sourceforge.net/tmda/?rev=2083&view=rev
Author:   jasonrm
Date:     2006-10-07 19:42:29 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
Prepare for upgrade to email package v4.0.1.  The 'strict' flag to Parser has been deprecated.  From 
the docs:

Deprecated since release 2.4. Because the Parser class is a backward compatible API wrapper around the 
new-in-Python 2.4 FeedParser, all parsing is effectively non-strict. You should simply stop passing a 
strict flag to the Parser constructor.

Also, in in msg_as_string() let's try to live without Tim's custom HeaderParsedGenerator and see what 
happens.

Modified Paths:
--------------
    trunk/tmda/TMDA/Util.py

Modified: trunk/tmda/TMDA/Util.py
===================================================================
--- trunk/tmda/TMDA/Util.py	2006-10-06 23:41:33 UTC (rev 2082)
+++ trunk/tmda/TMDA/Util.py	2006-10-08 02:42:29 UTC (rev 2083)
@@ -517,7 +517,7 @@
     return rp
 
 
-def msg_from_file(fp, strict=False, fullParse=False):
+def msg_from_file(fp, fullParse=False):
     """Read a file and parse its contents into a Message object model.
     Replacement for email.message_from_file().
     
@@ -528,11 +528,11 @@
     from email.Message import Message
     if fullParse:
 	from email.Parser import Parser
-	msg = Parser(Message, strict=strict).parse(fp)
+	msg = Parser(Message).parse(fp)
     else:
 	from email.Parser import HeaderParser
-	msg = HeaderParser(Message, strict=strict).parse(fp)
-    msg.header_parsed = 1
+	msg = HeaderParser(Message).parse(fp)
+    msg.header_parsed = True
     return msg
 
 
@@ -555,10 +555,11 @@
     Default is False."""
     from email import Generator
     fp = StringIO()
-    if hasattr(msg, 'header_parsed') and msg.header_parsed:
-        genclass = Generator.HeaderParsedGenerator
-    else:
-        genclass = Generator.Generator
+    #if hasattr(msg, 'header_parsed') and msg.header_parsed:
+    #    genclass = Generator.HeaderParsedGenerator
+    #else:
+         #genclass = Generator.Generator
+    genclass = Generator.Generator
     g = genclass(fp, mangle_from_=mangle_from_, maxheaderlen=maxheaderlen)
     g.flatten(msg, unixfrom=unixfrom)
     return fp.getvalue()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.