mirror of
https://github.com/python/cpython.git
synced 2025-11-04 11:49:12 +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.
........
94 lines
3.2 KiB
Python
94 lines
3.2 KiB
Python
import unittest
|
|
from test import test_support
|
|
|
|
import pwd
|
|
|
|
class PwdTest(unittest.TestCase):
|
|
|
|
def test_values(self):
|
|
entries = pwd.getpwall()
|
|
entriesbyname = {}
|
|
entriesbyuid = {}
|
|
|
|
for e in entries:
|
|
self.assertEqual(len(e), 7)
|
|
self.assertEqual(e[0], e.pw_name)
|
|
self.assert_(isinstance(e.pw_name, basestring))
|
|
self.assertEqual(e[1], e.pw_passwd)
|
|
self.assert_(isinstance(e.pw_passwd, basestring))
|
|
self.assertEqual(e[2], e.pw_uid)
|
|
self.assert_(isinstance(e.pw_uid, int))
|
|
self.assertEqual(e[3], e.pw_gid)
|
|
self.assert_(isinstance(e.pw_gid, int))
|
|
self.assertEqual(e[4], e.pw_gecos)
|
|
self.assert_(isinstance(e.pw_gecos, basestring))
|
|
self.assertEqual(e[5], e.pw_dir)
|
|
self.assert_(isinstance(e.pw_dir, basestring))
|
|
self.assertEqual(e[6], e.pw_shell)
|
|
self.assert_(isinstance(e.pw_shell, basestring))
|
|
|
|
# The following won't work, because of duplicate entries
|
|
# for one uid
|
|
# self.assertEqual(pwd.getpwuid(e.pw_uid), e)
|
|
# instead of this collect all entries for one uid
|
|
# and check afterwards
|
|
entriesbyname.setdefault(e.pw_name, []).append(e)
|
|
entriesbyuid.setdefault(e.pw_uid, []).append(e)
|
|
|
|
# check whether the entry returned by getpwuid()
|
|
# for each uid is among those from getpwall() for this uid
|
|
for e in entries:
|
|
if not e[0] or e[0] == '+':
|
|
continue # skip NIS entries etc.
|
|
self.assert_(pwd.getpwnam(e.pw_name) in entriesbyname[e.pw_name])
|
|
self.assert_(pwd.getpwuid(e.pw_uid) in entriesbyuid[e.pw_uid])
|
|
|
|
def test_errors(self):
|
|
self.assertRaises(TypeError, pwd.getpwuid)
|
|
self.assertRaises(TypeError, pwd.getpwnam)
|
|
self.assertRaises(TypeError, pwd.getpwall, 42)
|
|
|
|
# try to get some errors
|
|
bynames = {}
|
|
byuids = {}
|
|
for (n, p, u, g, gecos, d, s) in pwd.getpwall():
|
|
bynames[n] = u
|
|
byuids[u] = n
|
|
|
|
allnames = list(bynames.keys())
|
|
namei = 0
|
|
fakename = allnames[namei]
|
|
while fakename in bynames:
|
|
chars = list(fakename)
|
|
for i in range(len(chars)):
|
|
if chars[i] == 'z':
|
|
chars[i] = 'A'
|
|
break
|
|
elif chars[i] == 'Z':
|
|
continue
|
|
else:
|
|
chars[i] = chr(ord(chars[i]) + 1)
|
|
break
|
|
else:
|
|
namei = namei + 1
|
|
try:
|
|
fakename = allnames[namei]
|
|
except IndexError:
|
|
# should never happen... if so, just forget it
|
|
break
|
|
fakename = ''.join(chars)
|
|
|
|
self.assertRaises(KeyError, pwd.getpwnam, fakename)
|
|
|
|
# Choose a non-existent uid.
|
|
fakeuid = 4127
|
|
while fakeuid in byuids:
|
|
fakeuid = (fakeuid * 3) % 0x10000
|
|
|
|
self.assertRaises(KeyError, pwd.getpwuid, fakeuid)
|
|
|
|
def test_main():
|
|
test_support.run_unittest(PwdTest)
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|