[Python-checkins] python/dist/src/Lib/test test_descr.py,1.159,1.160
jvr@users.sourceforge.net
jvr@users.sourceforge.net
Sat, 23 Nov 2002 01:45:06 -0800
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv31972/Lib/test
Modified Files:
test_descr.py
Log Message:
Patch #642500 with slight modifications: allow keyword arguments in
dict() constructor. Example:
>>> dict(a=1, b=2)
{'a': 1, 'b': 2}
>>>
Index: test_descr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_descr.py,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** test_descr.py 14 Nov 2002 19:50:14 -0000 1.159
--- test_descr.py 23 Nov 2002 09:45:04 -0000 1.160
***************
*** 185,194 ****
d = dict({})
vereq(d, {})
! d = dict(items={})
vereq(d, {})
d = dict({1: 2, 'a': 'b'})
vereq(d, {1: 2, 'a': 'b'})
vereq(d, dict(d.items()))
! vereq(d, dict(items=d.iteritems()))
for badarg in 0, 0L, 0j, "0", [0], (0,):
try:
--- 185,201 ----
d = dict({})
vereq(d, {})
! d = dict({})
vereq(d, {})
d = dict({1: 2, 'a': 'b'})
vereq(d, {1: 2, 'a': 'b'})
vereq(d, dict(d.items()))
! vereq(d, dict(d.iteritems()))
! d = dict({'one':1, 'two':2})
! vereq(d, dict(one=1, two=2))
! vereq(d, dict(**d))
! vereq(d, dict({"one": 1}, two=2))
! vereq(d, dict([("two", 2)], one=1))
! vereq(d, dict([("one", 100), ("two", 200)], **d))
! verify(d is not dict(**d))
for badarg in 0, 0L, 0j, "0", [0], (0,):
try:
***************
*** 206,215 ****
else:
raise TestFailed("no TypeError from dict(%r)" % badarg)
- try:
- dict(senseless={})
- except TypeError:
- pass
- else:
- raise TestFailed("no TypeError from dict(senseless={})")
try:
--- 213,216 ----
***************
*** 233,237 ****
Mapping.keys = lambda self: self.dict.keys()
Mapping.__getitem__ = lambda self, i: self.dict[i]
! d = dict(items=Mapping())
vereq(d, Mapping.dict)
--- 234,238 ----
Mapping.keys = lambda self: self.dict.keys()
Mapping.__getitem__ = lambda self, i: self.dict[i]
! d = dict(Mapping())
vereq(d, Mapping.dict)
***************
*** 2333,2340 ****
vereq(tuple(sequence=range(3)), (0, 1, 2))
vereq(list(sequence=(0, 1, 2)), range(3))
! vereq(dict(items={1: 2}), {1: 2})
for constructor in (int, float, long, complex, str, unicode,
! tuple, list, dict, file):
try:
constructor(bogus_keyword_arg=1)
--- 2334,2341 ----
vereq(tuple(sequence=range(3)), (0, 1, 2))
vereq(list(sequence=(0, 1, 2)), range(3))
! # note: as of Python 2.3, dict() no longer has an "items" keyword arg
for constructor in (int, float, long, complex, str, unicode,
! tuple, list, file):
try:
constructor(bogus_keyword_arg=1)