[Python-checkins] python/dist/src/Lib/test test_types.py,1.50,1.51

rhettinger@users.sourceforge.net rhettinger@users.sourceforge.net
Tue, 06 May 2003 18:28:50 -0700


Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv29652/Lib/test

Modified Files:
	test_types.py 
Log Message:
SF bug #730296: Unexpected Changes in list Iterator

Reverted a Py2.3b1 change to iterator in subclasses of list and tuple.
They had been changed to use __getitem__ whenever it had been overriden
in the subclass.

This caused some usabilty and performance problems.  Also, it was
inconsistent with the rest of python where many container methods
access the underlying object directly without first checking for
an overridden getter.  Users needing a change in iterator behavior
should override it directly.



Index: test_types.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_types.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** test_types.py	24 Apr 2003 16:52:45 -0000	1.50
--- test_types.py	7 May 2003 01:28:47 -0000	1.51
***************
*** 257,265 ****
  vereq(list(tuple(f())), range(1000))
  
! # Verify that __getitem__ overrides are recognized by __iter__
  class T(tuple):
    def __getitem__(self, key):
       return str(key) + '!!!'
! vereq(iter(T()).next(), '0!!!')
  
  print '6.5.3 Lists'
--- 257,265 ----
  vereq(list(tuple(f())), range(1000))
  
! # Verify that __getitem__ overrides are not recognized by __iter__
  class T(tuple):
    def __getitem__(self, key):
       return str(key) + '!!!'
! vereq(iter(T((1,2))).next(), 1)
  
  print '6.5.3 Lists'
***************
*** 454,462 ****
  vereq(a, [0, 1, 1, 3, 2, 5, 3, 7, 4, 9])
  
! # Verify that __getitem__ overrides are recognized by __iter__
  class L(list):
    def __getitem__(self, key):
       return str(key) + '!!!'
! vereq(iter(L()).next(), '0!!!')
  
  
--- 454,462 ----
  vereq(a, [0, 1, 1, 3, 2, 5, 3, 7, 4, 9])
  
! # Verify that __getitem__ overrides are not recognized by __iter__
  class L(list):
    def __getitem__(self, key):
       return str(key) + '!!!'
! vereq(iter(L([1,2])).next(), 1)