Cleanup

Author: jhonabreul

src/runtime/Converter.cs

@@ -9,6 +9,7 @@
 using System.Text;
 
 using Python.Runtime.Native;
+using System.Linq;
 
 namespace Python.Runtime
 {
@@ -508,7 +509,6 @@ internal static bool ToManagedValue(BorrowedReference value, Type obType,
                 // Method bindings will be handled below along with actual Python callables
                 if (mt is not MethodBinding)
                 {
-                    // shouldn't happen
                     return false;
                 }
             }
@@ -549,7 +549,7 @@ internal static bool ToManagedValue(BorrowedReference value, Type obType,
                 return ToEnum(value, obType, out result, setError, out usedImplicit);
             }
 
-            if (Runtime.PyCallable_Check(value) != 0 && TryConvertToDelegate(value, obType, out result))
+            if (TryConvertToDelegate(value, obType, out result))
             {
                 return true;
             }
@@ -742,7 +742,7 @@ internal static bool TryConvertToDelegate(BorrowedReference pyValue, Type delega
         {
             result = null;
 
-            if (!typeof(MulticastDelegate).IsAssignableFrom(delegateType))
+            if (!typeof(MulticastDelegate).IsAssignableFrom(delegateType) || Runtime.PyCallable_Check(pyValue) == 0)
             {
                 return false;
             }
@@ -755,24 +755,22 @@ internal static bool TryConvertToDelegate(BorrowedReference pyValue, Type delega
             var code = string.Empty;
             var types = delegateType.GetGenericArguments();
 
-            using var _ = Py.GIL();
             using var locals = new PyDict();
             try
             {
-                for (var i = 0; i < types.Length; i++)
-                {
-                    var iString = i.ToString(CultureInfo.InvariantCulture);
-                    code += $",t{iString}";
-                    locals.SetItem($"t{iString}", types[i].ToPython());
-                }
-
                 using var pyCallable = new PyObject(pyValue);
                 locals.SetItem("pyCallable", pyCallable);
 
                 if (types.Length > 0)
                 {
+                    code = string.Join(',', types.Select((type, i) =>
+                    {
+                        var t = $"t{i}";
+                        locals.SetItem(t, type.ToPython());
+                        return t;
+                    }));
                     var name = delegateType.Name.Substring(0, delegateType.Name.IndexOf('`'));
-                    code = $"from System import {name}; delegate = {name}[{code.Substring(1)}](pyCallable)";
+                    code = $"from System import {name}; delegate = {name}[{code}](pyCallable)";
                 }
                 else
                 {

src/runtime/PythonTypes/PyObject.cs

@@ -225,17 +225,7 @@ public T SafeAs<T>()
         public bool TrySafeAs<T>(out T result)
         {
             using var _ = Py.GIL();
-            if (TryAsManagedObject(typeof(T), out var obj))
-            {
-                if (obj is T t)
-                {
-                    result = t;
-                    return true;
-                }
-            }
-
-            result = default!;
-            return false;
+            return TryAs(out result);
         }
 
         internal bool IsDisposed => rawPtr == IntPtr.Zero;