Resolve failure with jedi module (#1496)

* Resolve failure with jedi module

* Fix CA1853

* Fix test failure

* Add test

Author: slozier

Src/IronPython.Modules/_csv.cs

@@ -119,23 +119,18 @@ private static int GetFieldSizeLimit(CodeContext/*!*/ context) {
 
         [Documentation(@"Delete the name/dialect mapping associated with a string name.\n
     csv.unregister_dialect(name)")]
-        public static void unregister_dialect(CodeContext/*!*/ context,
-            string name) {
+        public static void unregister_dialect(CodeContext/*!*/ context, string name) {
             DialectRegistry dialects = GetDialects(context);
-            if (name == null || !dialects.ContainsKey(name))
-                throw MakeError("unknown dialect");
-
-            if (dialects.ContainsKey(name))
-                dialects.Remove(name);
+            if (name is not null && dialects.Remove(name)) return;
+            throw MakeError("unknown dialect");
         }
 
         [Documentation(@"Return the dialect instance associated with name.
     dialect = csv.get_dialect(name)")]
         public static object get_dialect(CodeContext/*!*/ context, string name) {
             DialectRegistry dialects = GetDialects(context);
-            if (name == null || !dialects.ContainsKey(name))
-                throw MakeError("unknown dialect");
-            return dialects[name];
+            if (name is not null && dialects.TryGetValue(name, out var value)) return value;
+            throw MakeError("unknown dialect");
         }
 
         [Documentation(@"Return a list of all know dialect names

Src/IronPython.Modules/_functools.cs

@@ -8,6 +8,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Text;
 using System.Threading;
 
 using IronPython.Runtime;
@@ -191,6 +192,24 @@ public void __setstate__(CodeContext context, [NotNone] PythonTuple state) {
                 }
             }
 
+            public string __repr__(CodeContext context) {
+                var builder = new StringBuilder();
+                builder.Append("functools.partial(");
+                builder.Append(PythonOps.Repr(context, func));
+                foreach (var x in _args) {
+                    builder.Append(", ");
+                    builder.Append(PythonOps.Repr(context, x));
+                }
+                foreach (var p in _keywordArgs) {
+                    builder.Append(", ");
+                    builder.Append(p.Key);
+                    builder.Append('=');
+                    builder.Append(PythonOps.Repr(context, p.Value));
+                }
+                builder.Append(')');
+                return builder.ToString();
+            }
+
             #endregion
 
             #region Operator methods

Src/IronPython/Runtime/Operations/PythonOps.cs

@@ -888,7 +888,9 @@ internal static bool Length(object? o, out int res, out BigInteger bigRes) {
                 return true;
             }
 
-            object len = PythonContext.InvokeUnaryOperator(DefaultContext.Default, UnaryOperators.Length, o, $"object of type '{GetPythonTypeName(o)}' has no len()");
+            if (!PythonContext.TryInvokeUnaryOperator(DefaultContext.Default, UnaryOperators.Length, o, out object len)) {
+                throw TypeError("object of type '{0}' has no len()", GetPythonTypeName(o));
+            }
 
             var indexObj = Index(len);
 

Src/IronPython/Runtime/PythonContext.cs

@@ -2137,14 +2137,8 @@ private static string GetTernarySymbol(TernaryOperators oper) {
             return symbol;
         }
 
-        internal static object InvokeUnaryOperator(CodeContext/*!*/ context, UnaryOperators oper, object target, string errorMsg) {
-            object res;
-            if (context.LanguageContext.InvokeOperatorWorker(context, oper, target, out res)) {
-                return res;
-            }
-
-            throw PythonOps.TypeError(errorMsg);
-        }
+        internal static bool TryInvokeUnaryOperator(CodeContext/*!*/ context, UnaryOperators oper, object target, out object res)
+            => context.LanguageContext.InvokeOperatorWorker(context, oper, target, out res);
 
         internal static object InvokeUnaryOperator(CodeContext/*!*/ context, UnaryOperators oper, object target) {
             object res;

Src/StdLib/Lib/types.py

@@ -38,7 +38,7 @@ def _m(self): pass
 
 # For Jython, the following two types are identical
 GetSetDescriptorType = type(FunctionType.__code__)
-MemberDescriptorType = type(FunctionType.__globals__)
+MemberDescriptorType = type(ModuleType.__dict__["__dict__"]) # ironpython: type(FunctionType.__globals__) is getset_descriptor
 
 del sys, _f, _g, _C,                              # Not for export
 

Tests/modules/type_related/test_types.py

@@ -16,4 +16,8 @@ def test_cp24741(self):
         m = types.ModuleType('m')
         self.assertEqual(m.__doc__, None)
 
+    def test_ipy3_gh1496(self):
+        self.assertEqual(repr(types.MemberDescriptorType), "<class 'member_descriptor'>")
+        self.assertEqual(repr(types.GetSetDescriptorType), "<class 'getset_descriptor'>")
+
 run_test(__name__)

Tests/test_functools_stdlib.py

@@ -50,7 +50,7 @@ def load_tests(loader, standard_tests, pattern):
         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(unittest.expectedFailure(test.test_functools.TestPartialC('test_repr'))) # AssertionError
+        suite.addTest(test.test_functools.TestPartialC('test_repr'))
         suite.addTest(unittest.expectedFailure(test.test_functools.TestPartialC('test_setstate_refcount'))) # AttributeError: 'partial' object has no attribute '__setstate__'
         suite.addTest(test.test_functools.TestPartialC('test_weakref'))
         suite.addTest(test.test_functools.TestPartialC('test_with_bound_and_unbound_methods'))