[Gzz-commits] gzz/gzz/modules/email converter.py mailtools.py

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/12/31 19:21:39

Modified files:
        gzz/modules/email: converter.py 
Added files:
        gzz/modules/email: mailtools.py 

Log message:
        split converter.py

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/mailtools.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/email/converter.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/email/converter.py
diff -u gzz/gzz/modules/email/converter.py:1.17 
gzz/gzz/modules/email/converter.py:1.18
--- gzz/gzz/modules/email/converter.py:1.17     Tue Dec 31 17:48:11 2002
+++ gzz/gzz/modules/email/converter.py  Tue Dec 31 19:21:39 2002
@@ -23,58 +23,9 @@
 import string
 import StringIO
 
-def delHeaderLines(header, fields):
-    """Takes a list of header-lines and a list of header fields and
-    removes every appereance of this field and it's parameters.
-    """
-    result = []
-    delLines = 0
-    foundField = 0
-    for line in header:
-        tline = line.lower()
-        for field in fields:
-            field = field.lower()
-            if tline[:len(field)] == field:
-                foundField = 1
-                break
-        if foundField:
-            foundField = 0
-            delLines = 1
-        elif not (delLines and line[0] == ' '):
-            result.append(line)
-            delLines = 0
-    return result
-
-def replaceHeaderLine(header, field, replacement):
-    result = []
-    delLines = 0
-    foundField = 0
-    tField = []
-    field = field.lower()
-    replaced = 0
-
-    for line in header:
-        tline = line.lower()
-        if tline[:len(field)] == field:
-            foundField = 1
-            replaced = 1
-        if foundField:
-            foundField = 0
-            delLines = 1
-            tField.append('X-Gzzmo-OH-' + line)
-        elif not (delLines and line[0] == ' '):
-            result += tField
-            if delLines: result.append(replacement)
-            result.append(line)
-            delLines = 0
-            tField = []
-        else:
-            tField.append(line)
-
-    if not replaced:
-        result.append(replacement)
-    return result
-  
+from gzz.modules.email.mailtools import delHeaderLines, getCharset, \
+                                        replaceHeaderLine, msgZip, \
+                                        getContentTypeParams
 
 def transformHeader(header, bodyID):
     """Transforms message header to a message/external-body header
@@ -92,18 +43,6 @@
     header.append('\r\n')
     return result + header
 
-def getCharset(msg):
-    if msg.getparam("charset") == None:
-        return "us-ascii"
-    else:
-        return msg.getparam("charset") 
-
-def getContentTypeParams(msg):
-    ctparams  = []
-    for param in msg.getplist():
-        ctparams.append(string.join(['; ', param], ''))
-    return ctparams
-
 def save(mediaserver, mail):
     mail      = re.sub(r'(\r\n|\r|\n)', '\r\n', mail)
     tMail     = StringIO.StringIO(mail)
@@ -223,17 +162,6 @@
     
     print "<==isReconstructable"
     return 1
-
-def msgZip(msg1, msg2):
-    msg1 = string.split(msg1, '\r\n')
-    msg2 = string.split(msg2, '\r\n')
-
-    ret = ""
-    for s in zip(msg1, msg2):
-        ret += s[0] + '\n'
-        ret += s[1] + '\n'
-
-    return ret
 
 def reconstruct(mail, mediaserver, msid, pos):
     print "==>reconstruct"