Changeset 154 for emailtotracscript

Timestamp:

04/24/07 10:28:14 (16 years ago)

Author:

bas

Message:

EmailToTracScript?
EmailtoTracScript?:

email2trac.py.in:

• Fixed bugs in the text_wrap function and reformat it so we do not have to use python2.4

Location:

emailtotracscript/trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (3 diffs)

emailtotracscript/trunk/ChangeLog

@@ -1 +1 @@
 2007-XXXXX
 
-        * Added some primarily check to catch an error when attachment size
+        * Added check to catch an error when attachment size
           is too large, bug #1153
           Author: Bas van der Vlies

emailtotracscript/trunk/email2trac.py.in

@@ -554 +554 @@
 
 
-        def wrap_text(str='', replace_whitespace = False):
+        def wrap_text(self, text, replace_whitespace = False):
                 """
                 Will break a lines longer then given length into several small lines of size 
@@ -560 +560 @@
                 """
                 import textwrap
+
                 LINESEPARATOR = '\n'
                 reformat = ''
 
-                for s in str.split(LINESEPARATOR):
-                        reformat = '%s%s' %(reformat, LINESEPARATOR.join(textwrap.fill(s,self.USE_TEXTWRAP)))
+                for s in text.split(LINESEPARATOR):
+                        tmp = textwrap.fill(s,self.USE_TEXTWRAP)
+                        if tmp:
+                                reformat = '%s\n%s' %(reformat,tmp)
+                        else:
+                                reformat = '%s\n' %reformat
 
                 return reformat
+
+                # Python2.4 and higher
+                #
+                #return LINESEPARATOR.join(textwrap.fill(s,width) for s in str.split(LINESEPARATOR))
+                #
+
 
         def get_body_text(self, msg):
@@ -589 +600 @@
                                 if not body_text:                       
                                         body_text = part.get_payload(decode=0)
-                
+        
                                 if self.STRIP_SIGNATURE:
                                         body_text = self.strip_signature(body_text)