mirror of
https://github.com/python/cpython.git
synced 2025-07-19 09:15:34 +00:00

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. ........
285 lines
6.1 KiB
Python
285 lines
6.1 KiB
Python
from test.test_support import verify, verbose, TestFailed, sortdict
|
|
from UserList import UserList
|
|
from UserDict import UserDict
|
|
|
|
def e(a, b):
|
|
print(a, b)
|
|
|
|
def f(*a, **k):
|
|
print(a, sortdict(k))
|
|
|
|
def g(x, *y, **z):
|
|
print(x, y, sortdict(z))
|
|
|
|
def h(j=1, a=2, h=3):
|
|
print(j, a, h)
|
|
|
|
f()
|
|
f(1)
|
|
f(1, 2)
|
|
f(1, 2, 3)
|
|
|
|
f(1, 2, 3, *(4, 5))
|
|
f(1, 2, 3, *[4, 5])
|
|
f(1, 2, 3, *UserList([4, 5]))
|
|
f(1, 2, 3, **{'a':4, 'b':5})
|
|
f(1, 2, 3, *(4, 5), **{'a':6, 'b':7})
|
|
f(1, 2, 3, x=4, y=5, *(6, 7), **{'a':8, 'b':9})
|
|
|
|
|
|
f(1, 2, 3, **UserDict(a=4, b=5))
|
|
f(1, 2, 3, *(4, 5), **UserDict(a=6, b=7))
|
|
f(1, 2, 3, x=4, y=5, *(6, 7), **UserDict(a=8, b=9))
|
|
|
|
|
|
# Verify clearing of SF bug #733667
|
|
try:
|
|
e(c=3)
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
print("should raise TypeError: e() got an unexpected keyword argument 'c'")
|
|
|
|
try:
|
|
g()
|
|
except TypeError as err:
|
|
print("TypeError:", err)
|
|
else:
|
|
print("should raise TypeError: not enough arguments; expected 1, got 0")
|
|
|
|
try:
|
|
g(*())
|
|
except TypeError as err:
|
|
print("TypeError:", err)
|
|
else:
|
|
print("should raise TypeError: not enough arguments; expected 1, got 0")
|
|
|
|
try:
|
|
g(*(), **{})
|
|
except TypeError as err:
|
|
print("TypeError:", err)
|
|
else:
|
|
print("should raise TypeError: not enough arguments; expected 1, got 0")
|
|
|
|
g(1)
|
|
g(1, 2)
|
|
g(1, 2, 3)
|
|
g(1, 2, 3, *(4, 5))
|
|
class Nothing: pass
|
|
try:
|
|
g(*Nothing())
|
|
except TypeError as attr:
|
|
pass
|
|
else:
|
|
print("should raise TypeError")
|
|
|
|
class Nothing:
|
|
def __len__(self):
|
|
return 5
|
|
try:
|
|
g(*Nothing())
|
|
except TypeError as attr:
|
|
pass
|
|
else:
|
|
print("should raise TypeError")
|
|
|
|
class Nothing:
|
|
def __len__(self):
|
|
return 5
|
|
def __getitem__(self, i):
|
|
if i < 3:
|
|
return i
|
|
else:
|
|
raise IndexError, i
|
|
g(*Nothing())
|
|
|
|
class Nothing:
|
|
def __init__(self):
|
|
self.c = 0
|
|
def __iter__(self):
|
|
return self
|
|
try:
|
|
g(*Nothing())
|
|
except TypeError as attr:
|
|
pass
|
|
else:
|
|
print("should raise TypeError")
|
|
|
|
class Nothing:
|
|
def __init__(self):
|
|
self.c = 0
|
|
def __iter__(self):
|
|
return self
|
|
def __next__(self):
|
|
if self.c == 4:
|
|
raise StopIteration
|
|
c = self.c
|
|
self.c += 1
|
|
return c
|
|
g(*Nothing())
|
|
|
|
# make sure the function call doesn't stomp on the dictionary?
|
|
d = {'a': 1, 'b': 2, 'c': 3}
|
|
d2 = d.copy()
|
|
verify(d == d2)
|
|
g(1, d=4, **d)
|
|
print(sortdict(d))
|
|
print(sortdict(d2))
|
|
verify(d == d2, "function call modified dictionary")
|
|
|
|
# what about willful misconduct?
|
|
def saboteur(**kw):
|
|
kw['x'] = locals() # yields a cyclic kw
|
|
return kw
|
|
d = {}
|
|
kw = saboteur(a=1, **d)
|
|
verify(d == {})
|
|
# break the cycle
|
|
del kw['x']
|
|
|
|
try:
|
|
g(1, 2, 3, **{'x':4, 'y':5})
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: keyword parameter redefined")
|
|
|
|
try:
|
|
g(1, 2, 3, a=4, b=5, *(6, 7), **{'a':8, 'b':9})
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: keyword parameter redefined")
|
|
|
|
try:
|
|
f(**{1:2})
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: keywords must be strings")
|
|
|
|
try:
|
|
h(**{'e': 2})
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: unexpected keyword argument: e")
|
|
|
|
try:
|
|
h(*h)
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: * argument must be a tuple")
|
|
|
|
try:
|
|
dir(*h)
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: * argument must be a tuple")
|
|
|
|
try:
|
|
None(*h)
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: * argument must be a tuple")
|
|
|
|
try:
|
|
h(**h)
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: ** argument must be a dictionary")
|
|
|
|
try:
|
|
dir(**h)
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: ** argument must be a dictionary")
|
|
|
|
try:
|
|
None(**h)
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: ** argument must be a dictionary")
|
|
|
|
try:
|
|
dir(b=1,**{'b':1})
|
|
except TypeError as err:
|
|
print(err)
|
|
else:
|
|
print("should raise TypeError: dir() got multiple values for keyword argument 'b'")
|
|
|
|
def f2(*a, **b):
|
|
return a, b
|
|
|
|
d = {}
|
|
for i in range(512):
|
|
key = 'k%d' % i
|
|
d[key] = i
|
|
a, b = f2(1, *(2, 3), **d)
|
|
print(len(a), len(b), b == d)
|
|
|
|
class Foo:
|
|
def method(self, arg1, arg2):
|
|
return arg1 + arg2
|
|
|
|
x = Foo()
|
|
print(Foo.method(*(x, 1, 2)))
|
|
print(Foo.method(x, *(1, 2)))
|
|
try:
|
|
print(Foo.method(*(1, 2, 3)))
|
|
except TypeError as err:
|
|
pass
|
|
else:
|
|
print('expected a TypeError for unbound method call')
|
|
try:
|
|
print(Foo.method(1, *(2, 3)))
|
|
except TypeError as err:
|
|
pass
|
|
else:
|
|
print('expected a TypeError for unbound method call')
|
|
|
|
# A PyCFunction that takes only positional parameters should allow an
|
|
# empty keyword dictionary to pass without a complaint, but raise a
|
|
# TypeError if the dictionary is non-empty.
|
|
id(1, **{})
|
|
try:
|
|
id(1, **{"foo": 1})
|
|
except TypeError:
|
|
pass
|
|
else:
|
|
raise TestFailed, 'expected TypeError; no exception raised'
|
|
|
|
a, b, d, e, v, k = 'A', 'B', 'D', 'E', 'V', 'K'
|
|
funcs = []
|
|
maxargs = {}
|
|
for args in ['', 'a', 'ab']:
|
|
for defargs in ['', 'd', 'de']:
|
|
for vararg in ['', 'v']:
|
|
for kwarg in ['', 'k']:
|
|
name = 'z' + args + defargs + vararg + kwarg
|
|
arglist = list(args) + ['%s="%s"' % (x, x) for x in defargs]
|
|
if vararg: arglist.append('*' + vararg)
|
|
if kwarg: arglist.append('**' + kwarg)
|
|
decl = (('def %s(%s): print("ok %s", a, b, d, e, v, ' +
|
|
'type(k) is type ("") and k or sortdict(k))')
|
|
% (name, ', '.join(arglist), name))
|
|
exec(decl)
|
|
func = eval(name)
|
|
funcs.append(func)
|
|
maxargs[func] = len(args + defargs)
|
|
|
|
for name in ['za', 'zade', 'zabk', 'zabdv', 'zabdevk']:
|
|
func = eval(name)
|
|
for args in [(), (1, 2), (1, 2, 3, 4, 5)]:
|
|
for kwargs in ['', 'a', 'd', 'ad', 'abde']:
|
|
kwdict = {}
|
|
for k in kwargs: kwdict[k] = k + k
|
|
print(func.__name__, args, sortdict(kwdict), '->', end=' ')
|
|
try: func(*args, **kwdict)
|
|
except TypeError as err: print(err)
|