[Python-checkins] CVS: python/dist/src/Lib/test test_descr.py,1.94,1.95

2001年10月25日 22:06:52 -0700

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv13745/python/Lib/test
Modified Files:
	test_descr.py 
Log Message:
Generalize dictionary() to accept a sequence of 2-sequences. At the
outer level, the iterator protocol is used for memory-efficiency (the
outer sequence may be very large if fully materialized); at the inner
level, PySequence_Fast() is used for time-efficiency (these should
always be sequences of length 2).
dictobject.c, new functions PyDict_{Merge,Update}FromSeq2. These are
wholly analogous to PyDict_{Merge,Update}, but process a sequence-of-2-
sequences argument instead of a mapping object. For now, I left these
functions file static, so no corresponding doc changes. It's tempting
to change dict.update() to allow a sequence-of-2-seqs argument too.
Also changed the name of dictionary's keyword argument from "mapping"
to "x". Got a better name? "mapping_or_sequence_of_pairs" isn't
attractive, although more so than "mosop" <wink>.
abstract.h, abstract.tex: Added new PySequence_Fast_GET_SIZE function,
much faster than going thru the all-purpose PySequence_Size.
libfuncs.tex:
- Document dictionary().
- Fiddle tuple() and list() to admit that their argument is optional.
- The long-winded repetitions of "a sequence, a container that supports
 iteration, or an iterator object" is getting to be a PITA. Many
 months ago I suggested factoring this out into "iterable object",
 where the definition of that could include being explicit about
 generators too (as is, I'm not sure a reader outside of PythonLabs
 could guess that "an iterator object" includes a generator call).
- Please check my curly braces -- I'm going blind <0.9 wink>.
abstract.c, PySequence_Tuple(): When PyObject_GetIter() fails, leave
its error msg alone now (the msg it produces has improved since
PySequence_Tuple was generalized to accept iterable objects, and
PySequence_Tuple was also stomping on the msg in cases it shouldn't
have even before PyObject_GetIter grew a better msg).
Index: test_descr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_descr.py,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** test_descr.py	2001年10月26日 04:26:12	1.94
--- test_descr.py	2001年10月26日 05:06:50	1.95
***************
*** 179,186 ****
 d = dictionary({})
 vereq(d, {})
! d = dictionary(mapping={})
 vereq(d, {})
 d = dictionary({1: 2, 'a': 'b'})
 vereq(d, {1: 2, 'a': 'b'})
 for badarg in 0, 0L, 0j, "0", [0], (0,):
 try:
--- 179,188 ----
 d = dictionary({})
 vereq(d, {})
! d = dictionary(x={})
 vereq(d, {})
 d = dictionary({1: 2, 'a': 'b'})
 vereq(d, {1: 2, 'a': 'b'})
+ vereq(d, dictionary(d.items()))
+ vereq(d, dictionary(x=d.iteritems()))
 for badarg in 0, 0L, 0j, "0", [0], (0,):
 try:
***************
*** 188,191 ****
--- 190,201 ----
 except TypeError:
 pass
+ except ValueError:
+ if badarg == "0":
+ # It's a sequence, and its elements are also sequences (gotta
+ # love strings <wink>), but they aren't of length 2, so this
+ # one seemed better as a ValueError than a TypeError.
+ pass
+ else:
+ raise TestFailed("no TypeError from dictionary(%r)" % badarg)
 else:
 raise TestFailed("no TypeError from dictionary(%r)" % badarg)
***************
*** 195,199 ****
 pass
 else:
! raise TestFailed("no TypeError from dictionary(senseless={}")

 try:
--- 205,209 ----
 pass
 else:
! raise TestFailed("no TypeError from dictionary(senseless={})")

 try:
***************
*** 205,213 ****

 class Mapping:
 dict = {1:2, 3:4, 'a':1j}

- def __getitem__(self, i):
- return self.dict[i]
- 
 try:
 dictionary(Mapping())
--- 215,221 ----

 class Mapping:
+ # Lacks a .keys() method; will be added later.
 dict = {1:2, 3:4, 'a':1j}

 try:
 dictionary(Mapping())
***************
*** 218,224 ****

 Mapping.keys = lambda self: self.dict.keys()
! d = dictionary(mapping=Mapping())
 vereq(d, Mapping.dict)

 def test_dir():
 if verbose:
--- 226,259 ----

 Mapping.keys = lambda self: self.dict.keys()
! Mapping.__getitem__ = lambda self, i: self.dict[i]
! d = dictionary(x=Mapping())
 vereq(d, Mapping.dict)

+ # Init from sequence of iterable objects, each producing a 2-sequence.
+ class AddressBookEntry:
+ def __init__(self, first, last):
+ self.first = first
+ self.last = last
+ def __iter__(self):
+ return iter([self.first, self.last])
+ 
+ d = dictionary([AddressBookEntry('Tim', 'Warsaw'),
+ AddressBookEntry('Barry', 'Peters'),
+ AddressBookEntry('Tim', 'Peters'),
+ AddressBookEntry('Barry', 'Warsaw')])
+ vereq(d, {'Barry': 'Warsaw', 'Tim': 'Peters'})
+ 
+ d = dictionary(zip(range(4), range(1, 5)))
+ vereq(d, dictionary([(i, i+1) for i in range(4)]))
+ 
+ # Bad sequence lengths.
+ for bad in ['tooshort'], ['too', 'long', 'by 1']:
+ try:
+ dictionary(bad)
+ except ValueError:
+ pass
+ else:
+ raise TestFailed("no ValueError from dictionary(%r)" % bad)
+ 
 def test_dir():
 if verbose:
***************
*** 1831,1835 ****
 vereq(tuple(sequence=range(3)), (0, 1, 2))
 vereq(list(sequence=(0, 1, 2)), range(3))
! vereq(dictionary(mapping={1: 2}), {1: 2})

 for constructor in (int, float, long, complex, str, unicode,
--- 1866,1870 ----
 vereq(tuple(sequence=range(3)), (0, 1, 2))
 vereq(list(sequence=(0, 1, 2)), range(3))
! vereq(dictionary(x={1: 2}), {1: 2})

 for constructor in (int, float, long, complex, str, unicode,
***************
*** 2372,2376 ****
 a = []
 list.__init__(a, sequence=[0, 1, 2])
! vereq(a, [0, 1, 2]) 

 def test_main():
--- 2407,2411 ----
 a = []
 list.__init__(a, sequence=[0, 1, 2])
! vereq(a, [0, 1, 2])

 def test_main():