Enable some test_itertools_stdlib tests

Author: slozier

Src/IronPython.Modules/IterTools.cs

@@ -8,16 +8,16 @@
 using System.Numerics;
 using System.Runtime.InteropServices;
 
-using Microsoft.Scripting;
-using Microsoft.Scripting.Runtime;
-using Microsoft.Scripting.Utils;
-
 using IronPython.Runtime;
 using IronPython.Runtime.Binding;
 using IronPython.Runtime.Exceptions;
 using IronPython.Runtime.Operations;
 using IronPython.Runtime.Types;
 
+using Microsoft.Scripting;
+using Microsoft.Scripting.Runtime;
+using Microsoft.Scripting.Utils;
+
 [assembly: PythonModule("itertools", typeof(IronPython.Modules.PythonIterTools))]
 namespace IronPython.Modules {
     public static class PythonIterTools {
@@ -233,7 +233,7 @@ private static void EnsureIterator(CodeContext/*!*/ context, object iter) {
                 if (iter == null ||
                     !PythonOps.HasAttr(context, iter, "__iter__") &&
                     !PythonOps.HasAttr(context, iter, "__getitem__")) {
-                        throw PythonOps.TypeError("'{0}' object is not iterable", PythonOps.GetPythonTypeName(iter));
+                    throw PythonOps.TypeError("'{0}' object is not iterable", PythonOps.GetPythonTypeName(iter));
                 }
             }
 
@@ -276,13 +276,13 @@ public count(BigInteger start) {
                 InnerEnumerator = BigIntYielder(this, start, 1);
             }
 
-            public count(int start=0, int step=1) {
+            public count(int start = 0, int step = 1) {
                 _curInt = start;
                 _step = step;
                 InnerEnumerator = IntYielder(this, start, step);
             }
 
-            public count([DefaultParameterValue(0)]int start, BigInteger step) {
+            public count([DefaultParameterValue(0)] int start, BigInteger step) {
                 _curInt = start;
                 _step = step;
                 InnerEnumerator = IntYielder(this, start, step);
@@ -300,7 +300,7 @@ public count(BigInteger start, BigInteger step) {
                 InnerEnumerator = BigIntYielder(this, start, step);
             }
 
-            public count(CodeContext/*!*/ context, [DefaultParameterValue(0)]object start, [DefaultParameterValue(1)]object step) {
+            public count(CodeContext/*!*/ context, [DefaultParameterValue(0)] object start, [DefaultParameterValue(1)] object step) {
                 EnsureNumeric(context, start);
                 EnsureNumeric(context, step);
                 _cur = start;
@@ -315,7 +315,7 @@ private static void EnsureNumeric(CodeContext/*!*/ context, object num) {
                 if (num == null ||
                     !PythonOps.HasAttr(context, num, "__int__") &&
                     !PythonOps.HasAttr(context, num, "__float__")) {
-                        throw PythonOps.TypeError("a number is required");
+                    throw PythonOps.TypeError("a number is required");
                 }
             }
 
@@ -548,9 +548,9 @@ private IEnumerator<object> Yielder(IEnumerator iter) {
             private IEnumerator<object> Grouper(IEnumerator iter, object curKey) {
                 while (PythonContext.Equal(GetKey(iter.Current), curKey)) {
                     yield return iter.Current;
-                    if (!MoveNextHelper(iter)) { 
-                        _fFinished = true; 
-                        yield break; 
+                    if (!MoveNextHelper(iter)) {
+                        _fFinished = true;
+                        yield break;
                     }
                 }
             }
@@ -675,7 +675,7 @@ public zip_longest(params object[] iterables) {
                 }
             }
 
-            public zip_longest([ParamDictionary]IDictionary<object, object> paramDict, params object[] iterables) {
+            public zip_longest([ParamDictionary] IDictionary<object, object> paramDict, params object[] iterables) {
                 object fill;
 
                 if (paramDict.TryGetValue("fillvalue", out fill)) {
@@ -760,11 +760,14 @@ private static Exception UnexpectedKeywordArgument(IDictionary<object, object> p
 
         [PythonType]
         public class product : IterBase {
+            private PythonTuple[] tuples;
+
             public product(CodeContext context, params object[] iterables) {
-                InnerEnumerator = Yielder(ArrayUtils.ConvertAll(iterables, x => new PythonList(context, PythonOps.GetEnumerator(x))));
+                tuples = ArrayUtils.ConvertAll(iterables, x => new PythonTuple(PythonOps.GetEnumerator(x)));
+                InnerEnumerator = Yielder(tuples);
             }
 
-            public product(CodeContext context, [ParamDictionary]IDictionary<object, object> paramDict, params object[] iterables) {
+            public product(CodeContext context, [ParamDictionary] IDictionary<object, object> paramDict, params object[] iterables) {
                 object repeat;
                 int iRepeat = 1;
                 if (paramDict.TryGetValue("repeat", out repeat)) {
@@ -782,29 +785,28 @@ public product(CodeContext context, [ParamDictionary]IDictionary<object, object>
                     throw UnexpectedKeywordArgument(paramDict);
                 }
 
-                PythonList[] finalIterables = new PythonList[iterables.Length * iRepeat];
+                tuples = new PythonTuple[iterables.Length * iRepeat];
                 for (int i = 0; i < iRepeat; i++) {
                     for (int j = 0; j < iterables.Length; j++) {
-                        finalIterables[i * iterables.Length + j] = new PythonList(context, iterables[j]);
+                        tuples[i * iterables.Length + j] = new PythonTuple(iterables[j]);
                     }
                 }
-                InnerEnumerator = Yielder(finalIterables);
+                InnerEnumerator = Yielder(tuples);
             }
 
             public PythonTuple __reduce__() {
-                // TODO
                 return PythonTuple.MakeTuple(
                     DynamicHelpers.GetPythonType(this),
-                    PythonTuple.MakeTuple(), // arguments
-                    null // state
+                    PythonTuple.MakeTuple(tuples), // arguments
+                    null // TODO: state
                 );
             }
 
             public void __setstate__(object state) {
                 // TODO
             }
 
-            private IEnumerator<object> Yielder(PythonList[] iterables) {
+            private IEnumerator<object> Yielder(PythonTuple[] iterables) {
                 if (iterables.Length > 0) {
                     IEnumerator[] enums = new IEnumerator[iterables.Length];
                     enums[0] = iterables[0].GetEnumerator();
@@ -833,6 +835,7 @@ private IEnumerator<object> Yielder(PythonList[] iterables) {
                 } else {
                     yield return PythonTuple.EMPTY;
                 }
+                tuples = new PythonTuple[1] { PythonTuple.EMPTY };
             }
         }
 
@@ -987,7 +990,7 @@ public permutations(CodeContext context, object iterable) {
 
             public permutations(CodeContext context, object iterable, object r) {
                 _data = new PythonList(context, iterable);
-                
+
                 InnerEnumerator = Yielder(GetR(r, _data));
             }
 
@@ -1078,7 +1081,7 @@ public repeat(object @object) {
             public repeat(object @object, int times) {
                 _obj = @object;
                 InnerEnumerator = Yielder();
-                _remaining = times;
+                _remaining = times < 0 ? 0 : times;
             }
 
             private IEnumerator<object> Yielder() {
@@ -1094,10 +1097,9 @@ public int __length_hint__() {
             }
 
             public PythonTuple __reduce__() {
-                // TODO
                 return PythonTuple.MakeTuple(
                     DynamicHelpers.GetPythonType(this),
-                    PythonTuple.MakeTuple() // arguments
+                    _fInfinite ? PythonTuple.MakeTuple(_obj) : PythonTuple.MakeTuple(_obj, _remaining) // arguments
                 );
             }
 
@@ -1150,9 +1152,9 @@ IEnumerator IEnumerable.GetEnumerator() {
 
             #endregion
         }
-        
+
         [PythonType]
-        public class starmap : IterBase {            
+        public class starmap : IterBase {
             public starmap(CodeContext context, object function, object iterable) {
                 InnerEnumerator = Yielder(context, function, PythonOps.GetEnumerator(iterable));
             }
@@ -1211,7 +1213,7 @@ public void __setstate__(object state) {
 
             private IEnumerator<object> Yielder(object predicate, IEnumerator iter) {
                 while (MoveNextHelper(iter)) {
-                    if(!Converter.ConvertToBoolean(
+                    if (!Converter.ConvertToBoolean(
                         _context.LanguageContext.CallSplat(predicate, iter.Current)
                     )) {
                         break;
@@ -1222,8 +1224,8 @@ private IEnumerator<object> Yielder(object predicate, IEnumerator iter) {
             }
         }
 
-        [PythonHidden]
-        public class TeeIterator : IEnumerator, IWeakReferenceable {
+        [PythonType("_tee")]
+        public sealed class TeeIterator : IEnumerator, IWeakReferenceable {
             internal IEnumerator _iter;
             internal PythonList _data;
             private int _curIndex = -1;

Tests/test_itertools_stdlib.py

@@ -26,8 +26,6 @@ def load_tests(loader, standard_tests, pattern):
             test.test_itertools.TestBasicOps('test_permutations'), # pickling
             test.test_itertools.TestBasicOps('test_product_issue_25021'),
             test.test_itertools.TestBasicOps('test_product_pickling'),
-            test.test_itertools.TestBasicOps('test_repeat'), # pickling
-            test.test_itertools.TestBasicOps('test_repeat_with_negative_times'),
             test.test_itertools.TestBasicOps('test_starmap'), # pickling
             test.test_itertools.TestBasicOps('test_takewhile'), # pickling
             test.test_itertools.TestBasicOps('test_tee'),