From: jlgijsbers <jlgijsbers@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Sat, 25 Oct 2003 12:03:41 +0000 (+0000)
Subject: Don't be strict about the space following the two hyphens indicating a
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7b6da56033491053762ff4cd9969ba60770bed58;p=roundup.git

Don't be strict about the space following the two hyphens indicating a
signature, it upsets the tests.


git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1939 57a73879-2fb5-44c3-a270-3262357dd7e2
---

diff --git a/roundup/mailgw.py b/roundup/mailgw.py
index c4a6780..544ef29 100644
--- a/roundup/mailgw.py
+++ b/roundup/mailgw.py
@@ -73,7 +73,7 @@ are calling the create() method to create a new node). If an auditor raises
 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 uidFromAddress(db, address, create=1, **user_props):
 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 ">"