Changeset 607

Timestamp:

08/30/12 15:31:46 (11 years ago)

Author:

bas

Message:

email_quote can now handle regular expression, closes #173
-- This line, and those below, will be ignored--

M email2trac.py.in
M ChangeLog?

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (4 diffs)

trunk/ChangeLog

@@ -37 +37 @@
 
   * Added a new option 'strip_signature_regex', default value: 
-      * '^-----Original Message-----$|^-- $'
+      * strip_signature_regex : ^-----Original Message-----$|^-- $
     This will strip signatures form the email messages. People can set their own regular
     expressions, closes #296, #155
     Author: steverweber add gmail dot com
-    Appplied by: Bas van der Vlies
+    Applied by: Bas van der Vlies
+
+  * email_quote can now handle regular expresions, default is:
+        email_quote : ^> .*
+    We now use the re.match function instead of line.startswith, closes #173
+    Suggested/Patch by: samuel add hoffstaetter dot com
+    Applied by: Bas van der Vlies
 
 2.5.0 

trunk/email2trac.py.in

@@ -182 +182 @@
 
         if not self.parameters.email_quote:
-            self.parameters.email_quote = '> '
+            self.parameters.email_quote = '^> .*'
 
         if not self.parameters.ticket_update_by_subject_lookback:
@@ -1876 +1876 @@
         Strip signature from message, inspired by Mailman software
         """
-        self.logger.debug('function strip_signature')
+        self.logger.debug('function strip_signature: %s' %self.parameters.strip_signature_regex)
 
         body = []
@@ -1938 +1938 @@
         Strip quotes from message by Nicolas Mendoza
         """
-        self.logger.debug('function strip_quotes')
+        self.logger.debug('function strip_quotes: %s' %self.parameters.email_quote)
 
         body = [] 
+
+        STRIP_RE = re.compile( self.parameters.email_quote )
+
         for line in text.splitlines():
+
             try:
 
-                if line.startswith(self.parameters.email_quote): 
+                match = STRIP_RE.match(line)
+                if match:
+                    print line
                     continue
 
@@ -1950 +1956 @@
 
                 tmp_line = self.email_to_unicode(line) 
-                if tmp_line.startswith(self.parameters.email_quote): 
+
+                match = STRIP_RE.match(tmp_line)
+                if match:
+                    print line
                     continue