Skip to content

Commit 0e633fd

Browse files
author
Johannes Gijsbers
committed
Don't be strict about the space following the two hyphens...
...indicating a signature, it upsets the tests.
1 parent 12b315f commit 0e633fd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

roundup/mailgw.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
7373
an exception, the original message is bounced back to the sender with the
7474
explanatory message given in the exception.
7575
76-
$Id: mailgw.py,v 1.134 2003-10-24 14:59:38 jlgijsbers Exp $
76+
$Id: mailgw.py,v 1.135 2003-10-25 12:03:41 jlgijsbers Exp $
7777
"""
7878

7979
import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
@@ -1036,7 +1036,7 @@ def uidFromAddress(db, address, create=1, **user_props):
10361036
def parseContent(content, keep_citations, keep_body,
10371037
blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'),
10381038
eol=re.compile(r'[\r\n]+'),
1039-
signature=re.compile(r'^[>|\s]*-- $'),
1039+
signature=re.compile(r'^[>|\s]*-- ?$'),
10401040
original_msg=re.compile(r'^[>|\s]*-----\s?Original Message\s?-----$')):
10411041
''' The message body is divided into sections by blank lines.
10421042
Sections where the second and all subsequent lines begin with a ">"

0 commit comments

Comments
 (0)