Changeset 96 for emailtotracscript/trunk

Timestamp:

07/13/06 08:23:32 (18 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.py.in:

-Try to fix some unicode errors, added some debug code

Location:

emailtotracscript/trunk

Files:

• debian/changelog (modified) (1 diff)
• email2trac.py.in (modified) (11 diffs)

emailtotracscript/trunk/debian/changelog

@@ +1 @@
+email2trac (0.7.4-2) stable; urgency=low
+
+  * New bug fixes for unicode support 
+
+ -- root <root@subtrac.sara.nl>  Tue, 11 Jul 2006 14:52:58 +0200
+
+email2trac (0.7.4-1) stable; urgency=low
+
+  * Unicode bug fixes
+
+ -- root <root@subtrac.sara.nl>  Tue, 11 Jul 2006 09:24:00 +0200
+
 email2trac (0.7.3-7) stable; urgency=low
 

emailtotracscript/trunk/email2trac.py.in

@@ -88 +88 @@
 from stat import *
 import mimetypes
-
-# Fix some errors
-#import codecs
-
+import syslog
+import traceback
+
+
+# Some global variables
+#
 trac_default_version = 0.9
+m = None 
+
 
 class TicketEmailParser(object):
@@ -201 +205 @@
 
                         if str:
-                                str = '%s %s' %(str, temp)
+                                str = u'%s %s' %(str, temp)
                         else:
-                                str = temp
-
+                                str = u'%s' %temp
+
+                str = str.encode('utf-8')
                 return str
 
@@ -306 +311 @@
                         for name,mail in addrs:
                                         try:
-                                                ticket['cc'] = '%s,%s' %(ticket['cc'], mail)
+                                                mail_list = '%s,%s' %(mail_list, mail)
                                         except:
-                                                ticket['cc'] = mail
-
-        def save_email_for_debug(self, message):
-                msg_file = '/var/tmp/msg.txt' 
+                                                mail_list = mail
+
+                        ticket['cc'] = self.to_unicode(mail_list)
+
+        def save_email_for_debug(self, message, tempfile=False):
+                if tempfile:
+                        import tempfile
+                        msg_file = tempfile.mktemp('.email2trac')
+                else:
+                        msg_file = '/var/tmp/msg.txt' 
                 print 'TD: saving email to %s' % msg_file
                 fx = open(msg_file, 'wb')
@@ -382 +393 @@
 
                 if not msg['Subject']:
-                        tkt['summary'] = '(geen subject)'
+                        tkt['summary'] = u'(geen subject)'
                 else:
                         tkt['summary'] = self.to_unicode(msg['Subject'])
@@ -417 +428 @@
                 # field of a ticket
                 #
-                tkt['description'] = 'email2trac:%s\r\n{{{\r\n%s\r\n}}}' \
+                tkt['description'] = u'email2trac:%s\r\n{{{\r\n%s\r\n}}}' \
                         %(head, body_text)
 
@@ -433 +444 @@
                 if self.MAILTO:
                         mailto = self.html_mailto_link(self.to_unicode(msg['subject']), ticket_id, body_text)
-                        tkt['description'] = 'email2trac:%s%s\r\n{{{\r\n%s\r\n}}}' %(head, mailto, body_text)
+                        tkt['description'] = u'email2trac:%s%s\r\n{{{\r\n%s\r\n}}}' %(head, mailto, body_text)
                         comment = '\nadded mailto line\n'
                         changed = True
@@ -455 +466 @@
 
         def parse(self, fp):
+                global m
+
                 m = email.message_from_file(fp)
                 if not m:
@@ -485 +498 @@
                 """
                 has_description = 0
-                ubody_text = '\r\n{{{\nNo plain text message\n}}}\r\n'
+                ubody_text = u'\r\n{{{\nNo plain text message\n}}}\r\n'
                 for part in msg.walk():
 
@@ -505 +518 @@
                                 charset = part.get_content_charset('iso-8859-15')
                                 try:
-                                        temp = unicode(body_text, charset)
+                                        ubody_text = unicode(body_text, charset)
                                 except (UnicodeError,LookupError):
-                                        temp = unicode(body_text, 'iso-8859-15')
-
-                                ubody_text = temp.encode('utf-8')
+                                        ubody_text = unicode(body_text, 'iso-8859-15')
 
                         elif part.get_content_type() == 'text/html':
-                                ubody_text = '\r\n(see attachment for HTML mail message)\r\n'
+                                ubody_text = u'\r\n(see attachment for HTML mail message)\r\n'
 
                         else:
-                                ubody_text = '\r\n(see attachment for message)\r\n'
+                                ubody_text = u'\r\n(see attachment for message)\r\n'
 
                         has_description = 1
@@ -521 +532 @@
 
                 if not has_description:
-                        ubody_text = '\r\n(see attachment for message)\r\n'
-
-                return ubody_text
+                        ubody_text = u'\r\n(see attachment for message)\r\n'
+
+                return ubody_text.encode('utf-8')
 
         def notify(self, tkt , new=True, modtime=0):
@@ -793 +804 @@
         #
         except Exception, error:
-                import syslog, traceback
+                if m:
+                        self.save_email_for_debug(m, True)
 
                 if ENABLE_SYSLOG: