Changeset 462

Timestamp:

07/26/10 10:09:40 (13 years ago)

Author:

bas

Message:

Fixed an Unicode error in strip_quotes and update versions info

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2010-07-26
+    * Fixed an Unicode error in strip_quotes
+    Author: Bas van der Vlies
+    
 2010-07-23
     * logging of spam message was wrong. Fixed it, 

trunk/debian/changelog

@@ +1 @@
+email2trac (1.5.3-1) stable; urgency=low
+
+  * See ChangeLog
+
+ -- bas van der Vlies <basv@sara.nl>  Mon, 26 Jul 2010 10:08:23 +0200
+
 email2trac (1.5.2-3) stable; urgency=low
 

trunk/email2trac.py.in

@@ -1547 +1547 @@
                 Strip signature from message, inspired by Mailman software
                 """
+                self.logger.debug('function strip_signature')
+
                 body = []
                 for line in text.splitlines():
@@ -1596 +1598 @@
                 Strip quotes from message by Nicolas Mendoza
                 """
+                self.logger.debug('function strip_quotes')
+
                 body = [] 
                 for line in text.splitlines():
-                        if line.startswith(self.parameters.email_quote): 
-                                continue
+                        try:
+
+                                if line.startswith(self.parameters.email_quote): 
+                                        continue
+
+                        except UnicodeDecodeError:
+
+                                tmp_line = self.email_to_unicode(line) 
+                                if tmp_line.startswith(self.parameters.email_quote): 
+                                        continue
+                                
                         body.append(line)
 

trunk/email2trac.spec

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