[Python-checkins] python/dist/src/Lib/test test_iter.py,1.28,1.29 test_builtin.py,1.21,1.22

rhettinger@users.sourceforge.net rhettinger@users.sourceforge.net
Sat, 02 Aug 2003 00:42:59 -0700


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

Modified Files:
	test_iter.py test_builtin.py 
Log Message:
As discussed on python-dev, changed builtin.zip() to handle zero arguments
by returning an empty list instead of raising a TypeError.



Index: test_iter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_iter.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** test_iter.py	23 Dec 2002 16:50:58 -0000	1.28
--- test_iter.py	2 Aug 2003 07:42:56 -0000	1.29
***************
*** 424,428 ****
      # Test zip()'s use of iterators.
      def test_builtin_zip(self):
!         self.assertRaises(TypeError, zip)
          self.assertRaises(TypeError, zip, None)
          self.assertRaises(TypeError, zip, range(10), 42)
--- 424,431 ----
      # Test zip()'s use of iterators.
      def test_builtin_zip(self):
!         self.assertEqual(zip(), [])
!         self.assertEqual(zip(*[]), [])
!         self.assertEqual(zip(*[(1, 2), 'ab']), [(1, 'a'), (2, 'b')])
! 
          self.assertRaises(TypeError, zip, None)
          self.assertRaises(TypeError, zip, range(10), 42)

Index: test_builtin.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_builtin.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** test_builtin.py	18 Jun 2003 14:26:18 -0000	1.21
--- test_builtin.py	2 Aug 2003 07:42:56 -0000	1.22
***************
*** 1127,1131 ****
                  return i + 4
          self.assertEqual(zip(a, I()), t)
!         self.assertRaises(TypeError, zip)
          self.assertRaises(TypeError, zip, None)
          class G:
--- 1127,1132 ----
                  return i + 4
          self.assertEqual(zip(a, I()), t)
!         self.assertEqual(zip(), [])
!         self.assertEqual(zip(*[]), [])
          self.assertRaises(TypeError, zip, None)
          class G: