fix #447

python/builtins.py

@@ -60,16 +60,18 @@ def filter(f, iterable):
         if f(i):
             yield i
 
-def zip(a, b):
+class zip:
-    a = iter(a)
+    def __init__(self, *iterables):
-    b = iter(b)
+        self.iterables = [iter(it) for it in iterables]
-    while True:
+
-        try:
+    def __iter__(self):
-            ai = next(a)
+        return self
-            bi = next(b)
+
-        except StopIteration:
+    def __next__(self):
-            break
+        result = []
-        yield ai, bi
+        for it in self.iterables:
+            result.append(next(it))
+        return tuple(result)
 
 def reversed(iterable):
     a = list(iterable)

tests/720_collections.py

@@ -381,6 +381,21 @@ for x, y in zip(d, e):
     # verify that original order and values are retained.
     assertEqual(x is y, True)
 
+# https://github.com/pocketpy/pocketpy/issues/447
+names = ["Alice", "Bob", "Charlie"]
+ages = [25, 30, 35]
+cities = ["NY", "LA", "SF"]
+result = []
+for name, age, city in zip(names, ages, cities):
+    result.append((name, age, city))
+assertEqual(result, [("Alice", 25, "NY"), ("Bob", 30, "LA"), ("Charlie", 35, "SF")])
+
+cities.pop()
+result = []
+for name, age, city in zip(names, ages, cities):
+    result.append((name, age, city))
+assertEqual(result, [("Alice", 25, "NY"), ("Bob", 30, "LA")])
+
 ########### test repr#############
 d = deque(range(200))
 e = eval(repr(d))