Enable some functools tests (#968)

Author: slozier

Src/IronPython.Modules/_functools.cs

@@ -74,12 +74,11 @@ public class partial : IWeakReferenceable {
             private const string _defaultDoc = "partial(func, *args, **keywords) - new function with partial application\n    of the given arguments and keywords.\n";
 
             private readonly CodeContext/*!*/ _context;                                             // code context from the caller who created us
-            private readonly object/*!*/ _function;                                                 // the callable function to dispatch to
-            private readonly object[]/*!*/ _args;                                                   // the initially provided arguments
-            private readonly IDictionary<object, object> _keywordArgs;                              // the initially provided keyword arguments or null
+            private object?[]/*!*/ _args;                                                           // the initially provided arguments
+            private IDictionary<object, object?> _keywordArgs;                                      // the initially provided keyword arguments
 
-            private CallSite<Func<CallSite, CodeContext, object, object[], IDictionary<object, object>, object>>? _dictSite; // the dictionary call site if ever called w/ keyword args
-            private CallSite<Func<CallSite, CodeContext, object, object[], object>>? _splatSite;    // the position only call site
+            private CallSite<Func<CallSite, CodeContext, object, object?[], IDictionary<object, object?>, object>>? _dictSite; // the dictionary call site if ever called w/ keyword args
+            private CallSite<Func<CallSite, CodeContext, object, object?[], object>>? _splatSite;   // the position only call site
             private PythonDictionary? _dict;                                                        // dictionary for storing extra attributes
             private WeakRefTracker? _tracker;                                                       // tracker so users can use Python weak references
             private string? _doc;                                                                   // A custom docstring, if used
@@ -101,8 +100,8 @@ public partial(CodeContext/*!*/ context, object? func, [NotNull, ParamDictionary
                     throw PythonOps.TypeError("the first argument must be callable");
                 }
 
-                _function = func;
-                _keywordArgs = keywords;
+                this.func = func;
+                _keywordArgs = new PythonDictionary(keywords);
                 _args = args;
                 _context = context;
             }
@@ -122,25 +121,17 @@ public static void Set__doc__([NotNull]partial self, object? value) {
             }
 
             /// <summary>
-            /// Gets the function which will be called
+            /// Gets the function which will be called.
             /// </summary>
-            public object func {
-                get {
-                    return _function;
-                }
-            }
+            public object func { get; private set; }
 
             /// <summary>
             /// Gets the initially provided positional arguments.
             /// </summary>
-            public object args {
-                get {
-                    return PythonTuple.MakeTuple(_args);
-                }
-            }
+            public object args => PythonTuple.MakeTuple(_args);
 
             /// <summary>
-            /// Gets the initially provided keyword arguments or None.
+            /// Gets the initially provided keyword arguments.
             /// </summary>
             public object keywords {
                 get {
@@ -178,11 +169,28 @@ public PythonTuple __reduce__() {
                 return PythonTuple.MakeTuple(
                     DynamicHelpers.GetPythonTypeFromType(typeof(partial)),
                     PythonTuple.MakeTuple(func),
-                    PythonTuple.MakeTuple(func,  args, keywords),
-                    null // TODO: what should this be?
+                    PythonTuple.MakeTuple(func, args, keywords, __dict__)
                 );
             }
 
+            public void __setstate__(CodeContext context, [NotNull] PythonTuple state) {
+                if (state.Count == 4
+                        && PythonOps.IsCallable(context, state[0])
+                        && state[1] is PythonTuple args
+                        && state[2] is PythonDictionary keywords) {
+                    func = state[0]!;
+                    _args = args._data;
+                    _keywordArgs = keywords;
+                    if (state[3] is PythonDictionary dict)
+                        __dict__.update(context, dict);
+                    else if (!(state[3] is null)) {
+                        throw PythonOps.TypeError("invalid partial state");
+                    }
+                } else {
+                    throw PythonOps.TypeError("invalid partial state");
+                }
+            }
+
             #endregion
 
             #region Operator methods
@@ -191,23 +199,23 @@ public PythonTuple __reduce__() {
             /// Calls func with the previously provided arguments and more positional arguments.
             /// </summary>
             [SpecialName]
-            public object? Call(CodeContext/*!*/ context, [NotNull]params object[] args) {
+            public object? Call(CodeContext/*!*/ context, [NotNull]params object?[] args) {
                 if (_keywordArgs == null) {
                     EnsureSplatSite();
-                    return _splatSite!.Target(_splatSite, context, _function, ArrayUtils.AppendRange(_args, args));
+                    return _splatSite!.Target(_splatSite, context, func, ArrayUtils.AppendRange(_args, args));
                 }
 
                 EnsureDictSplatSite();
-                return _dictSite!.Target(_dictSite, context, _function, ArrayUtils.AppendRange(_args, args), _keywordArgs);
+                return _dictSite!.Target(_dictSite, context, func, ArrayUtils.AppendRange(_args, args), _keywordArgs);
             }
 
             /// <summary>
             /// Calls func with the previously provided arguments and more positional arguments and keyword arguments.
             /// </summary>
             [SpecialName]
-            public object? Call(CodeContext/*!*/ context, [ParamDictionary, NotNull]IDictionary<object, object> dict, [NotNull]params object[] args) {
+            public object? Call(CodeContext/*!*/ context, [ParamDictionary, NotNull]IDictionary<object, object?> dict, [NotNull]params object?[] args) {
 
-                IDictionary<object, object> finalDict;
+                IDictionary<object, object?> finalDict;
                 if (_keywordArgs != null) {
                     PythonDictionary pd = new PythonDictionary();
                     pd.update(context, _keywordArgs);
@@ -219,7 +227,7 @@ public PythonTuple __reduce__() {
                 }
 
                 EnsureDictSplatSite();
-                return _dictSite!.Target(_dictSite, context, _function, ArrayUtils.AppendRange(_args, args), finalDict);
+                return _dictSite!.Target(_dictSite, context, func, ArrayUtils.AppendRange(_args, args), finalDict);
             }
 
             /// <summary>
@@ -267,7 +275,7 @@ private void EnsureSplatSite() {
                 if (_splatSite == null) {
                     Interlocked.CompareExchange(
                         ref _splatSite,
-                        CallSite<Func<CallSite, CodeContext, object, object[], object>>.Create(
+                        CallSite<Func<CallSite, CodeContext, object, object?[], object>>.Create(
                             Binders.InvokeSplat(_context.LanguageContext)
                         ),
                         null
@@ -279,7 +287,7 @@ private void EnsureDictSplatSite() {
                 if (_dictSite == null) {
                     Interlocked.CompareExchange(
                         ref _dictSite,
-                        CallSite<Func<CallSite, CodeContext, object, object[], IDictionary<object, object>, object>>.Create(
+                        CallSite<Func<CallSite, CodeContext, object, object?[], IDictionary<object, object?>, object>>.Create(
                             Binders.InvokeKeywords(_context.LanguageContext)
                         ),
                         null

Src/IronPython/Runtime/PythonDictionary.cs

@@ -49,6 +49,15 @@ internal PythonDictionary(IDictionary dict) {
             _storage = storage;
         }
 
+        internal PythonDictionary(IDictionary<object, object> dict) {
+            var storage = new CommonDictionaryStorage();
+
+            foreach (var pair in dict) {
+                storage.AddNoLock(pair.Key, pair.Value);
+            }
+            _storage = storage;
+        }
+
         internal PythonDictionary(PythonDictionary dict) {
             _storage = dict._storage.Clone();
         }

Src/StdLib/Lib/test/test_functools.py

@@ -1,5 +1,6 @@
 import abc
 import collections
+import gc
 from itertools import permutations
 import pickle
 from random import choice
@@ -124,6 +125,7 @@ def test_weakref(self):
         p = proxy(f)
         self.assertEqual(f.func, p.func)
         f = None
+        gc.collect() # required by IronPython
         self.assertRaises(ReferenceError, getattr, p, 'func')
 
     def test_with_bound_and_unbound_methods(self):

Tests/test_functools_stdlib.py

@@ -17,7 +17,7 @@ def load_tests(loader, standard_tests, pattern):
     if sys.implementation.name == 'ironpython':
         suite = unittest.TestSuite()
         #suite.addTest(test.test_functools.TestCmpToKeyC('test_bad_cmp')) # TypeError: cmp_to_key() takes exactly 1 argument (2 given)
-        #uite.addTest(test.test_functools.TestCmpToKeyC('test_cmp_to_key')) # TypeError: cmp_to_key() takes exactly 1 argument (2 given)
+        #suite.addTest(test.test_functools.TestCmpToKeyC('test_cmp_to_key')) # TypeError: cmp_to_key() takes exactly 1 argument (2 given)
         #suite.addTest(test.test_functools.TestCmpToKeyC('test_cmp_to_key_arguments')) # TypeError: cmp_to_key() takes exactly 1 argument (2 given)
         #suite.addTest(test.test_functools.TestCmpToKeyC('test_hash')) # TypeError: cmp_to_key() takes exactly 1 argument (2 given)
         #suite.addTest(test.test_functools.TestCmpToKeyC('test_obj_field')) # TypeError: cmp_to_key() takes exactly 1 argument (2 given)
@@ -47,12 +47,12 @@ def load_tests(loader, standard_tests, pattern):
         suite.addTest(test.test_functools.TestPartialC('test_keyword'))
         suite.addTest(test.test_functools.TestPartialC('test_kw_combinations'))
         suite.addTest(test.test_functools.TestPartialC('test_no_side_effects'))
-        #suite.addTest(test.test_functools.TestPartialC('test_pickle')) # StackOverflowException
+        suite.addTest(test.test_functools.TestPartialC('test_pickle'))
         suite.addTest(test.test_functools.TestPartialC('test_positional'))
         suite.addTest(test.test_functools.TestPartialC('test_protection_of_callers_dict_argument'))
         #suite.addTest(test.test_functools.TestPartialC('test_repr')) # AssertionError
         #suite.addTest(test.test_functools.TestPartialC('test_setstate_refcount')) # AttributeError: 'partial' object has no attribute '__setstate__'
-        #suite.addTest(test.test_functools.TestPartialC('test_weakref')) # AssertionError: ReferenceError not raised by getattr
+        suite.addTest(test.test_functools.TestPartialC('test_weakref'))
         suite.addTest(test.test_functools.TestPartialC('test_with_bound_and_unbound_methods'))
         suite.addTest(test.test_functools.TestPartialCSubclass('test_arg_combinations'))
         suite.addTest(test.test_functools.TestPartialCSubclass('test_argument_checking'))
@@ -63,12 +63,12 @@ def load_tests(loader, standard_tests, pattern):
         suite.addTest(test.test_functools.TestPartialCSubclass('test_keyword'))
         suite.addTest(test.test_functools.TestPartialCSubclass('test_kw_combinations'))
         suite.addTest(test.test_functools.TestPartialCSubclass('test_no_side_effects'))
-        #suite.addTest(test.test_functools.TestPartialCSubclass('test_pickle')) # StackOverflowException
+        suite.addTest(test.test_functools.TestPartialCSubclass('test_pickle'))
         suite.addTest(test.test_functools.TestPartialCSubclass('test_positional'))
         suite.addTest(test.test_functools.TestPartialCSubclass('test_protection_of_callers_dict_argument'))
         #suite.addTest(test.test_functools.TestPartialCSubclass('test_repr')) # AssertionError
         #suite.addTest(test.test_functools.TestPartialCSubclass('test_setstate_refcount')) # AttributeError: 'PartialSubclass' object has no attribute '__setstate__'
-        #suite.addTest(test.test_functools.TestPartialCSubclass('test_weakref')) # AssertionError: ReferenceError not raised by getattr
+        suite.addTest(test.test_functools.TestPartialCSubclass('test_weakref'))
         suite.addTest(test.test_functools.TestPartialCSubclass('test_with_bound_and_unbound_methods'))
         suite.addTest(test.test_functools.TestPartialMethod('test_abstract'))
         suite.addTest(test.test_functools.TestPartialMethod('test_arg_combinations'))
@@ -90,7 +90,7 @@ def load_tests(loader, standard_tests, pattern):
         suite.addTest(test.test_functools.TestPartialPy('test_no_side_effects'))
         suite.addTest(test.test_functools.TestPartialPy('test_positional'))
         suite.addTest(test.test_functools.TestPartialPy('test_protection_of_callers_dict_argument'))
-        #suite.addTest(test.test_functools.TestPartialPy('test_weakref')) # AssertionError: ReferenceError not raised by getattr
+        suite.addTest(test.test_functools.TestPartialPy('test_weakref'))
         suite.addTest(test.test_functools.TestPartialPy('test_with_bound_and_unbound_methods'))
         suite.addTest(test.test_functools.TestReduce('test_iterator_usage'))
         suite.addTest(test.test_functools.TestReduce('test_reduce'))
@@ -105,11 +105,11 @@ def load_tests(loader, standard_tests, pattern):
         suite.addTest(test.test_functools.TestSingleDispatch('test_register_decorator'))
         suite.addTest(test.test_functools.TestSingleDispatch('test_simple_overloads'))
         suite.addTest(test.test_functools.TestSingleDispatch('test_wrapping_attributes'))
-        #suite.addTest(test.test_functools.TestTotalOrdering('test_no_operations_defined')) # AssertionError: ValueError not raised
-        #suite.addTest(test.test_functools.TestTotalOrdering('test_total_ordering_ge')) # TypeError: unsupported operand type(s) for <: 'A' and 'A'
-        #suite.addTest(test.test_functools.TestTotalOrdering('test_total_ordering_gt')) # TypeError: unsupported operand type(s) for <=: 'A' and 'A'
-        #suite.addTest(test.test_functools.TestTotalOrdering('test_total_ordering_le')) # TypeError: unsupported operand type(s) for <: 'A' and 'A'
-        #suite.addTest(test.test_functools.TestTotalOrdering('test_total_ordering_lt')) # TypeError: unsupported operand type(s) for <=: 'A' and 'A'
+        suite.addTest(test.test_functools.TestTotalOrdering('test_no_operations_defined'))
+        suite.addTest(test.test_functools.TestTotalOrdering('test_total_ordering_ge'))
+        suite.addTest(test.test_functools.TestTotalOrdering('test_total_ordering_gt'))
+        suite.addTest(test.test_functools.TestTotalOrdering('test_total_ordering_le'))
+        suite.addTest(test.test_functools.TestTotalOrdering('test_total_ordering_lt'))
         #suite.addTest(test.test_functools.TestTotalOrdering('test_total_ordering_no_overwrite')) # ValueError: must define at least one ordering operation: < > <= >=
         suite.addTest(test.test_functools.TestTotalOrdering('test_type_error_when_not_implemented'))
         suite.addTest(test.test_functools.TestUpdateWrapper('test_builtin_update'))