[Python-checkins] r53521 - in python/branches/release25-maint/Lib: mailbox.py test/test_old_mailbox.py
andrew.kuchling
python-checkins at python.org
Mon Jan 22 21:49:44 CET 2007
Author: andrew.kuchling
Date: Mon Jan 22 21:49:44 2007
New Revision: 53521
Modified:
python/branches/release25-maint/Lib/mailbox.py
python/branches/release25-maint/Lib/test/test_old_mailbox.py
Log:
[Bug #1633678] Improve pattern used for mbox 'From' lines; add a simple test
Modified: python/branches/release25-maint/Lib/mailbox.py
==============================================================================
--- python/branches/release25-maint/Lib/mailbox.py (original)
+++ python/branches/release25-maint/Lib/mailbox.py Mon Jan 22 21:49:44 2007
@@ -1974,8 +1974,10 @@
# necessary. For convenience, we've added a PortableUnixMailbox class
# which does no checking of the format of the 'From' line.
- _fromlinepattern = r"From \s*[^\s]+\s+\w\w\w\s+\w\w\w\s+\d?\d\s+" \
- r"\d?\d:\d\d(:\d\d)?(\s+[^\s]+)?\s+\d\d\d\d\s*$"
+ _fromlinepattern = (r"From \s*[^\s]+\s+\w\w\w\s+\w\w\w\s+\d?\d\s+"
+ r"\d?\d:\d\d(:\d\d)?(\s+[^\s]+)?\s+\d\d\d\d\s*"
+ r"[^\s]*\s*"
+ "$")
_regexp = None
def _strict_isrealfromline(self, line):
Modified: python/branches/release25-maint/Lib/test/test_old_mailbox.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_old_mailbox.py (original)
+++ python/branches/release25-maint/Lib/test/test_old_mailbox.py Mon Jan 22 21:49:44 2007
@@ -109,11 +109,44 @@
self.assertEqual(len(str(msg)), len(FROM_)+len(DUMMY_MESSAGE))
self.assertEqual(n, 1)
+class MboxTestCase(unittest.TestCase):
+ def setUp(self):
+ # create a new maildir mailbox to work with:
+ self._path = test_support.TESTFN
+
+ def tearDown(self):
+ os.unlink(self._path)
+
+ def test_from_regex (self):
+ # Testing new regex from bug #1633678
+ f = open(self._path, 'w')
+ f.write("""From fred at example.com Mon May 31 13:24:50 2004 +0200
+Subject: message 1
+
+body1
+From fred at example.com Mon May 31 13:24:50 2004 -0200
+Subject: message 2
+
+body2
+From fred at example.com Mon May 31 13:24:50 2004
+Subject: message 3
+
+body3
+From fred at example.com Mon May 31 13:24:50 2004
+Subject: message 4
+
+body4
+""")
+ f.close()
+ box = mailbox.UnixMailbox(open(self._path, 'r'))
+ self.assert_(len(list(iter(box))) == 4)
+
+
# XXX We still need more tests!
def test_main():
- test_support.run_unittest(MaildirTestCase)
+ test_support.run_unittest(MaildirTestCase, MboxTestCase)
if __name__ == "__main__":
More information about the Python-checkins
mailing list