Changeset 139 for emailtotracscript/trunk/email2trac.py.in

Timestamp:

12/04/06 12:10:41 (17 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.py.in:

• Fixed some unicode problem that crashes trac

File:

• emailtotracscript/trunk/email2trac.py.in (modified) (16 diffs)

emailtotracscript/trunk/email2trac.py.in

@@ -182 +182 @@
                         self.STRIP_SIGNATURE = 0
 
-
         # X-Spam-Score: *** (3.255) BAYES_50,DNS_FROM_AHBL_RHSBL,HTML_
         # Note if Spam_level then '*' are included
@@ -198 +197 @@
                 return self.get_config('ticket', 'default_component') 
 
-        def to_unicode(self, str):
+        def email_to_unicode(self, message_str):
                 """
                 Email has 7 bit ASCII code, convert it to unicode with the charset
@@ -204 +203 @@
                 understands it.
                 """
-                results =  email.Header.decode_header(str)
+                results =  email.Header.decode_header(message_str)
                 str = None
                 for text,format in results:
@@ -210 +209 @@
                                 try:
                                         temp = unicode(text, format)
-                                except (UnicodeError,LookupError):
+                                except UnicodeError, detail:
                                         # This always works 
                                         #
                                         temp = unicode(text, 'iso-8859-15')
+                                except LookupError, detail:
+                                        #text = 'ERROR: Could not find charset: %s, please install' %format
+                                        #temp = unicode(text, 'iso-8859-15')
+                                        temp = message_str
+                                        
                         else:
                                 temp = string.strip(text)
@@ -223 +227 @@
                                 str = '%s' %temp
 
-                str = str.encode('utf-8')
+                #str = str.encode('utf-8')
                 return str
 
@@ -267 +271 @@
                         str = "%s'''Cc:''' %s [[BR]]" % (str, m['Cc'])
 
-                #return  self.to_unicode(str)
-                return  util.text.to_unicode(str)
+                return  self.email_to_unicode(str)
 
 
@@ -300 +303 @@
                         self.email_field = users[0]
                 else:
-                        #self.email_field =  self.to_unicode(message['from'])
-                        self.email_field =  util.text.to_unicode(message['from'])
+                        self.email_field =  self.email_to_unicode(message['from'])
 
         def set_reply_fields(self, ticket, message):
@@ -335 +337 @@
 
                         if mail_list:
-                                #ticket['cc'] = self.to_unicode(mail_list)
-                                ticket['cc'] = util.text.to_unicode(mail_list)
+                                ticket['cc'] = self.email_to_unicode(mail_list)
 
         def save_email_for_debug(self, message, tempfile=False):
@@ -362 +363 @@
                         return False
                 else:
-                        #subject  = self.to_unicode(m['Subject'])
-                        subject  = util.text.to_unicode(m['Subject'])
+                        subject  = self.email_to_unicode(m['Subject'])
 
                 TICKET_RE = re.compile(r"""
@@ -423 +423 @@
                         tkt['summary'] = u'(geen subject)'
                 else:
-                        #tkt['summary'] = self.to_unicode(msg['Subject'])
-                        tkt['summary'] = util.text.to_unicode(msg['Subject'])
+                        tkt['summary'] = self.email_to_unicode(msg['Subject'])
 
 
@@ -470 +469 @@
                         changed = True
                         comment = '\nadded mailto line\n'
-                        #mailto = self.html_mailto_link(self.to_unicode(msg['subject']), ticket_id, body_text)
-                        mailto = self.html_mailto_link(util.text.to_unicode(msg['subject']), ticket_id, body_text)
-                        #tkt['description'] = 'email2trac:%s%s\r\n{{{\r\n%s\r\n}}}' %(head, mailto, body_text)
+                        mailto = self.html_mailto_link(self.email_to_unicode(msg['subject']), ticket_id, body_text)
                         tkt['description'] = 'email2trac:%s%s\r\n%s' %(head, mailto, body_text)
 
@@ -569 +566 @@
 
                                 except LookupError, detail:
-                                        ubody_text = body_text
-                                        encoding = False
+                                        ubody_text = 'ERROR: Could not find charset: %s, please install' %(charset)
 
                         elif part.get_content_type() == 'text/html':
@@ -632 +628 @@
                         author = self.email_addr
                 else:   
-                        #author = self.to_unicode(self.author)
-                        author = util.text.to_unicode(self.author)
+                        author = self.email_to_unicode(self.author)
 
                 # Must find a fix
@@ -681 +676 @@
                                 filename = '%s%s' % (filename, ext)
                         else:
-                                #filename = self.to_unicode(filename)
-                                filename = util.text.to_unicode(filename)
+                                filename = self.email_to_unicode(filename)
 
                         # From the trac code
@@ -746 +740 @@
                                 if not update:
                                         att.author = self.author
-                                        #att.description = self.to_unicode('Added by email2trac')
-                                        att.description = util.text.to_unicode('Added by email2trac')
+                                        att.description = self.email_to_unicode('Added by email2trac')
 
                                 att.insert(url_filename, fd, filesize)
@@ -877 +870 @@
                         from trac.web.href import Href
                         from trac import util
+                        #
+                        # return  util.text.to_unicode(str)
+                        #
                         # see http://projects.edgewall.com/trac/changeset/2799
                         from trac.ticket.notification import TicketNotifyEmail