Changeset 213 for trunk/email2trac.py.in

Timestamp:

07/11/08 16:55:28 (16 years ago)

Author:

bas

Message:

email2trac.py.in:

• fixed some formating problems with trac version 0.11

debian/control:

• Removed trac from depend statement. Trac 0.11 is distributed as egg

File:

• trunk/email2trac.py.in (modified) (6 diffs)

trunk/email2trac.py.in

@@ -377 +377 @@
                 """
                 str = ''
-                if m['To'] and len(m['To']) > 0 and m['To'] != 'hic@sara.nl':
-                        str = "'''To:''' %s [[BR]]" %(m['To'])
+                #if m['To'] and len(m['To']) > 0 and m['To'] != 'hic@sara.nl':
+                if m['To'] and len(m['To']) > 0:
+                        str = "'''To:''' %s\r\n" %(m['To'])
                 if m['Cc'] and len(m['Cc']) > 0:
-                        str = "%s'''Cc:''' %s [[BR]]" % (str, m['Cc'])
+                        str = "%s'''Cc:''' %s\r\n" % (str, m['Cc'])
 
                 return  self.email_to_unicode(str)
@@ -620 +621 @@
                 if self.EMAIL_HEADER:
                         head = self.email_header_txt(m)
-                        body_text = u"\r\n%s \r\n%s" %(head, body_text)
+                        body_text = u"%s\r\n%s" %(head, body_text)
 
                 tkt.save_changes(self.author, body_text, when)
@@ -716 +717 @@
                 body_text = self.get_body_text(msg)
 
-                tkt['description'] = '\r\n%s\r\n%s' \
+                tkt['description'] = '%s\r\n%s' \
                         %(head, body_text)
 
@@ -741 +742 @@
                         #mailto = self.html_mailto_link(tkt['summary'], ticket_id, body_text)
                         mailto = self.html_mailto_link( m['Subject'], ticket_id, body_text)
-                        tkt['description'] = u'\r\n%s\r\n%s%s\r\n' \
+                        tkt['description'] = u'%s\r\n%s%s\r\n' \
                                 %(head, mailto, body_text)
 
@@ -944 +945 @@
 
                         tn = TicketNotifyEmail(self.env)
+
                         if self.notify_template:
                                 tn.template_name = self.notify_template;
@@ -973 +975 @@
                            )
 
-                str = '\r\n{{{\r\n#!html\r\n<a href="%s">Reply to: %s</a>\r\n}}}\r\n' %(str, author)
+                str = '\r\n{{{\r\n#!html\r\n<a\r\n href="%s">Reply to: %s\r\n</a>\r\n}}}\r\n' %(str, author)
                 return str