# HG changeset patch # User Johannes Gijsbers # Date 1067083421 0 # Node ID ea63531ddeec121c03f8aa53c8226d8832a23572 # Parent 3260268e45d2ebfbcfda5604aaf299a095e44626 Don't be strict about the space following the two hyphens... ...indicating a signature, it upsets the tests. diff -r 3260268e45d2 -r ea63531ddeec roundup/mailgw.py --- a/roundup/mailgw.py Sat Oct 25 12:02:37 2003 +0000 +++ b/roundup/mailgw.py Sat Oct 25 12:03:41 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.134 2003-10-24 14:59:38 jlgijsbers Exp $ +$Id: mailgw.py,v 1.135 2003-10-25 12:03:41 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]*-- $'), + 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 ">"