mirror of
https://github.com/python/cpython.git
synced 2025-11-19 18:47:27 +00:00
c1f779cb01
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r56127 | georg.brandl | 2007-06-30 09:32:49 +0200 (Sat, 30 Jun 2007) | 2 lines
Fix a place where floor division would be in order.
........
r56135 | guido.van.rossum | 2007-07-01 06:13:54 +0200 (Sun, 01 Jul 2007) | 28 lines
Make map() and filter() identical to itertools.imap() and .ifilter(),
respectively.
I fixed two bootstrap issues, due to the dynamic import of itertools:
1. Starting python requires that map() and filter() are not used until
site.py has added build/lib.<arch> to sys.path.
2. Building python requires that setup.py and distutils and everything
they use is free of map() and filter() calls.
Beyond this, I only fixed the tests in test_builtin.py.
Others, please help fixing the remaining tests that are now broken!
The fixes are usually simple:
a. map(None, X) -> list(X)
b. map(F, X) -> list(map(F, X))
c. map(lambda x: F(x), X) -> [F(x) for x in X]
d. filter(F, X) -> list(filter(F, X))
e. filter(lambda x: P(x), X) -> [x for x in X if P(x)]
Someone, please also contribute a fixer for 2to3 to do this.
It can leave map()/filter() calls alone that are already
inside a list() or sorted() call or for-loop.
Only in rare cases have I seen code that depends on map() of lists
of different lengths going to the end of the longest, or on filter()
of a string or tuple returning an object of the same type; these
will need more thought to fix.
........
r56136 | guido.van.rossum | 2007-07-01 06:22:01 +0200 (Sun, 01 Jul 2007) | 3 lines
Make it so that test_decimal fails instead of hangs, to help automated
test runners.
........
r56139 | georg.brandl | 2007-07-01 18:20:58 +0200 (Sun, 01 Jul 2007) | 2 lines
Fix a few test cases after the map->imap change.
........
r56142 | neal.norwitz | 2007-07-02 06:38:12 +0200 (Mon, 02 Jul 2007) | 1 line
Get a bunch more tests passing after converting map/filter to return iterators.
........
r56147 | guido.van.rossum | 2007-07-02 15:32:02 +0200 (Mon, 02 Jul 2007) | 4 lines
Fix the remaining failing unit tests (at least on OSX).
Also tweaked urllib2 so it doesn't raise socket.gaierror when
all network interfaces are turned off.
........
153 lines
4.5 KiB
Python
153 lines
4.5 KiB
Python
# This set of tests exercises the backward-compatibility class
|
|
# in mailbox.py (the ones without write support).
|
|
|
|
import mailbox
|
|
import os
|
|
import time
|
|
import unittest
|
|
from test import test_support
|
|
|
|
# cleanup earlier tests
|
|
try:
|
|
os.unlink(test_support.TESTFN)
|
|
except os.error:
|
|
pass
|
|
|
|
FROM_ = "From some.body@dummy.domain Sat Jul 24 13:43:35 2004\n"
|
|
DUMMY_MESSAGE = """\
|
|
From: some.body@dummy.domain
|
|
To: me@my.domain
|
|
Subject: Simple Test
|
|
|
|
This is a dummy message.
|
|
"""
|
|
|
|
class MaildirTestCase(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
# create a new maildir mailbox to work with:
|
|
self._dir = test_support.TESTFN
|
|
os.mkdir(self._dir)
|
|
os.mkdir(os.path.join(self._dir, "cur"))
|
|
os.mkdir(os.path.join(self._dir, "tmp"))
|
|
os.mkdir(os.path.join(self._dir, "new"))
|
|
self._counter = 1
|
|
self._msgfiles = []
|
|
|
|
def tearDown(self):
|
|
list(map(os.unlink, self._msgfiles))
|
|
os.rmdir(os.path.join(self._dir, "cur"))
|
|
os.rmdir(os.path.join(self._dir, "tmp"))
|
|
os.rmdir(os.path.join(self._dir, "new"))
|
|
os.rmdir(self._dir)
|
|
|
|
def createMessage(self, dir, mbox=False):
|
|
t = int(time.time() % 1000000)
|
|
pid = self._counter
|
|
self._counter += 1
|
|
filename = os.extsep.join((str(t), str(pid), "myhostname", "mydomain"))
|
|
tmpname = os.path.join(self._dir, "tmp", filename)
|
|
newname = os.path.join(self._dir, dir, filename)
|
|
fp = open(tmpname, "w")
|
|
self._msgfiles.append(tmpname)
|
|
if mbox:
|
|
fp.write(FROM_)
|
|
fp.write(DUMMY_MESSAGE)
|
|
fp.close()
|
|
if hasattr(os, "link"):
|
|
os.link(tmpname, newname)
|
|
else:
|
|
fp = open(newname, "w")
|
|
fp.write(DUMMY_MESSAGE)
|
|
fp.close()
|
|
self._msgfiles.append(newname)
|
|
return tmpname
|
|
|
|
def test_empty_maildir(self):
|
|
"""Test an empty maildir mailbox"""
|
|
# Test for regression on bug #117490:
|
|
self.mbox = mailbox.Maildir(test_support.TESTFN)
|
|
self.assert_(len(self.mbox) == 0)
|
|
self.assert_(self.mbox.next() is None)
|
|
self.assert_(self.mbox.next() is None)
|
|
|
|
def test_nonempty_maildir_cur(self):
|
|
self.createMessage("cur")
|
|
self.mbox = mailbox.Maildir(test_support.TESTFN)
|
|
self.assert_(len(self.mbox) == 1)
|
|
self.assert_(self.mbox.next() is not None)
|
|
self.assert_(self.mbox.next() is None)
|
|
self.assert_(self.mbox.next() is None)
|
|
|
|
def test_nonempty_maildir_new(self):
|
|
self.createMessage("new")
|
|
self.mbox = mailbox.Maildir(test_support.TESTFN)
|
|
self.assert_(len(self.mbox) == 1)
|
|
self.assert_(self.mbox.next() is not None)
|
|
self.assert_(self.mbox.next() is None)
|
|
self.assert_(self.mbox.next() is None)
|
|
|
|
def test_nonempty_maildir_both(self):
|
|
self.createMessage("cur")
|
|
self.createMessage("new")
|
|
self.mbox = mailbox.Maildir(test_support.TESTFN)
|
|
self.assert_(len(self.mbox) == 2)
|
|
self.assert_(self.mbox.next() is not None)
|
|
self.assert_(self.mbox.next() is not None)
|
|
self.assert_(self.mbox.next() is None)
|
|
self.assert_(self.mbox.next() is None)
|
|
|
|
def test_unix_mbox(self):
|
|
### should be better!
|
|
import email.Parser
|
|
fname = self.createMessage("cur", True)
|
|
n = 0
|
|
for msg in mailbox.PortableUnixMailbox(open(fname),
|
|
email.Parser.Parser().parse):
|
|
n += 1
|
|
self.assertEqual(msg["subject"], "Simple Test")
|
|
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@example.com Mon May 31 13:24:50 2004 +0200
|
|
Subject: message 1
|
|
|
|
body1
|
|
From fred@example.com Mon May 31 13:24:50 2004 -0200
|
|
Subject: message 2
|
|
|
|
body2
|
|
From fred@example.com Mon May 31 13:24:50 2004
|
|
Subject: message 3
|
|
|
|
body3
|
|
From fred@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, MboxTestCase)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|