[pypy-svn] r8657 - in pypy/dist/pypy/module: . test

[ac at codespeak.net]

Author: ac
Date: Fri Jan 28 12:12:58 2005
New Revision: 8657

Modified:
   pypy/dist/pypy/module/__builtin__module.py
   pypy/dist/pypy/module/test/test_zip.py
Log:
Have zip match python 2.3 and 2.4 behaviour as appropriate.

Modified: pypy/dist/pypy/module/__builtin__module.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__module.py	(original)
+++ pypy/dist/pypy/module/__builtin__module.py	Fri Jan 28 12:12:58 2005
@@ -144,6 +144,9 @@
        ignoring the trailing items in the other collections."""
 
     if len(collections) == 0:
+        import sys
+        if sys.version_info < (2,4):
+            raise TypeError("zip() requires at least one sequence")
         return []
     res = []
     iterators = [ iter(collection) for collection in collections ]

Modified: pypy/dist/pypy/module/test/test_zip.py
==============================================================================
--- pypy/dist/pypy/module/test/test_zip.py	(original)
+++ pypy/dist/pypy/module/test/test_zip.py	Fri Jan 28 12:12:58 2005
@@ -3,6 +3,12 @@
 class AppTestZip:
 
    def test_zip_no_arguments(self):
+      import sys
+      if sys.version_info < (2,4):
+          # Test 2.3 behaviour
+          raises(TypeError, zip)
+          return
+      # Test 2.4 behaviour
       assert zip() ==  []
       assert zip(*[]) == []