Changeset 142

Timestamp:

12/05/06 16:19:57 (17 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.py.in:

• Forgot to unicode the author
• Preparing for new version

Location:

emailtotracscript/trunk

Files:

• ChangeLog (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• email2trac.py.in (modified) (7 diffs)
• email2trac.spec (modified) (1 diff)

emailtotracscript/trunk/ChangeLog

@@ -1 @@
-2XXXXXX
+2006-12-
         * email2trac.py:
           - Added verbatim_format option default is: 1
@@ -13 +13 @@
           Fixed by: Bas van der Vlies
 
-           - Fixed statements: str + unicode, raises an exception if 
-             non-ascii value in unicode object.
+          - Fixed statements: str + unicode, raises an exception if 
+            non-ascii value in unicode object.
+
+          - Forgot to unicode the author. So we got an error if we use 
+            the mailto_link option in email2trac.conf. 
           Fixed by: Bas van der Vlies
 

emailtotracscript/trunk/debian/changelog

@@ +1 @@
+email2trac (0.9.0-1) stable; urgency=low
+
+  * New version nothing changed 
+
+ -- root <root@subtrac.sara.nl>  Mon,  4 Dec 2006 18:57:16 +0100
+
 email2trac (0.8.2-2) stable; urgency=low
 

emailtotracscript/trunk/email2trac.py.in

@@ -292 +292 @@
                 self.author, self.email_addr  = email.Utils.parseaddr(message['from'])
 
+                self.author = self.email_to_unicode(self.author)
+                #self.author = self.author.encode('utf-8', 'replace')
+
                 # Look for email address in registered trac users
                 #
@@ -448 +451 @@
                         head = self.email_header_txt(msg)
                         
-
                 body_text = self.get_body_text(msg)
 
                 tkt['description'] = '\r\n%s\r\n%s' \
-                        %(head, body_text.decode('utf-8'))
+                        %(head, body_text)
 
                 when = int(time.time())
@@ -468 +470 @@
                 if self.MAILTO:
                         changed = True
-                        comment = '\nadded mailto line\n'
-                        mailto = self.html_mailto_link(self.email_to_unicode(msg['subject']), ticket_id, body_text)
-                        tkt['description'] = '\r\n%s%s\r\n%s\r\n' \
-                                %(head, mailto, body_text.decode('utf-8'))
+                        comment = u'\nadded mailto line\n'
+                        mailto = self.html_mailto_link(tkt['summary'], ticket_id, body_text)
+                        tkt['description'] = u'\r\n%s\r\n%s%s\r\n' \
+                                %(head, mailto, body_text)
 
                 n =  self.attachments(msg, tkt)
@@ -589 +591 @@
                 #  else we a lot of garbage
                 #
-                if encoding:
-                        ubody_text = ubody_text.encode('utf-8')
+                #if encoding:
+                #       ubody_text = ubody_text.encode('utf-8')
 
                 if self.VERBATIM_FORMAT:
@@ -627 +629 @@
         def html_mailto_link(self, subject, id, body):
                 if not self.author:
-                        author = self.email_addr
+                        author = self.self.email_addr
                 else:   
-                        author = self.email_to_unicode(self.author)
+                        author = self.author
 
                 # Must find a fix
@@ -639 +641 @@
 
                 # Temporary fix
+                #
                 str = 'mailto:%s?Subject=%s&Cc=%s' %( 
                        urllib.quote(self.email_addr), 
@@ -646 +649 @@
 
                 str = '\r\n{{{\r\n#!html\r\n<a href="%s">Reply to: %s</a>\r\n}}}\r\n' %(str, author)
-
                 return str
 

emailtotracscript/trunk/email2trac.spec

@@ -1 +1 @@
 Summary: Utilities for converting emails to trac tickets
 Name: email2trac
-Version: 0.8.2
+Version: 0.9.0
 Release: 1
 License: GPL