From: richard Date: Sun, 21 Oct 2001 03:35:30 +0000 (+0000) Subject: bug #473125: Paragraph in e-mails X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e4d72bb1f9124020c9f2dbd1bf96e2314f729d5a;p=roundup.git bug #473125: Paragraph in e-mails git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@320 57a73879-2fb5-44c3-a270-3262357dd7e2 --- diff --git a/CHANGES.txt b/CHANGES.txt index aad2c99..3dc98a9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -22,6 +22,7 @@ Fixed: as numbers now. . bug #473126: Sender unknown . bug #473130: Nosy list not set correctly + . bug #473125: Paragraph in e-mails 2001-10-11 - 0.3.0 pre 2 Fixed: diff --git a/roundup/mailgw.py b/roundup/mailgw.py index c01235c..b20d1a8 100644 --- a/roundup/mailgw.py +++ b/roundup/mailgw.py @@ -72,7 +72,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.21 2001-10-21 00:53:42 richard Exp $ +$Id: mailgw.py,v 1.22 2001-10-21 03:35:13 richard Exp $ ''' @@ -414,10 +414,13 @@ def parseContent(content, blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'), if signature.match(lines[0]): break l.append(section) - return summary, '\n'.join(l) + return summary, '\n\n'.join(l) # # $Log: not supported by cvs2svn $ +# Revision 1.21 2001/10/21 00:53:42 richard +# bug #473130: Nosy list not set correctly +# # Revision 1.20 2001/10/17 23:13:19 richard # Did a fair bit of work on the admin tool. Now has an extra command "table" # which displays node information in a tabular format. Also fixed import and diff --git a/test/test_mailsplit.py b/test/test_mailsplit.py index 9b0a924..62e8c29 100644 --- a/test/test_mailsplit.py +++ b/test/test_mailsplit.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: test_mailsplit.py,v 1.5 2001-08-07 00:24:43 richard Exp $ +# $Id: test_mailsplit.py,v 1.6 2001-10-21 03:35:13 richard Exp $ import unittest, cStringIO @@ -83,6 +83,13 @@ userfoo@foo.com self.assertEqual(summary, 'testing') self.assertEqual(content, 'testing') + def testParagraphs(self): + s = '''testing\n\ntesting\n\ntesting''' + summary, content = parseContent(s) + print `summary`, `content` + self.assertEqual(summary, 'testing') + self.assertEqual(content, 'testing\n\ntesting\n\ntesting') + def testEmpty(self): s = '' summary, content = parseContent(s) @@ -95,6 +102,9 @@ def suite(): # # $Log: not supported by cvs2svn $ +# Revision 1.5 2001/08/07 00:24:43 richard +# stupid typo +# # Revision 1.4 2001/08/07 00:15:51 richard # Added the copyright/license notice to (nearly) all files at request of # Bizar Software.