diff roundup/mailgw.py @ 1859:492a962b6d6f

Make signature matching more precise: only match '-- '... (note the space) as a signature starter [SF#827775].
author Johannes Gijsbers <jlgijsbers@users.sourceforge.net>
date Fri, 24 Oct 2003 14:59:38 +0000
parents 4ac11e7fa11a
children ea63531ddeec
line wrap: on
line diff
--- a/roundup/mailgw.py	Fri Oct 24 09:32:19 2003 +0000
+++ b/roundup/mailgw.py	Fri Oct 24 14:59:38 2003 +0000
@@ -73,7 +73,7 @@
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception. 
 
-$Id: mailgw.py,v 1.133 2003-10-04 11:21:47 jlgijsbers Exp $
+$Id: mailgw.py,v 1.134 2003-10-24 14:59:38 jlgijsbers Exp $
 """
 
 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
@@ -1036,7 +1036,7 @@
 def parseContent(content, keep_citations, keep_body,
         blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'),
         eol=re.compile(r'[\r\n]+'), 
-        signature=re.compile(r'^[>|\s]*[-_]+\s*$'),
+        signature=re.compile(r'^[>|\s]*-- $'),
         original_msg=re.compile(r'^[>|\s]*-----\s?Original Message\s?-----$')):
     ''' The message body is divided into sections by blank lines.
         Sections where the second and all subsequent lines begin with a ">"

Roundup Issue Tracker: http://roundup-tracker.org/