when converting to object, wrap values of unknown type into PyObject instead of failing

lostmsu · lostmsu · commit 2cb16fe3292b · 2019-10-21T12:35:17.000-07:00
This enables overload resolution with object parameters to behave the same way PyObject parameters behave - e.g. allow any Python object to be passed as PyObject as fallback. Resolves #811
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,6 +54,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Reattach python exception traceback information (#545)
 -   PythonEngine.Intialize will now call `Py_InitializeEx` with a default value of 0, so signals will not be configured by default on embedding. This is different from the previous behaviour, where `Py_Initialize` was called instead, which sets initSigs to 1. ([#449][i449])
 -   Refactored MethodBinder.Bind in preparation to make it extensible (#829)
+-   When calling C# from Python, enable passing argument of any type to a parameter of C# type `object` by wrapping it into `PyObject` instance. ([#881][i881])
 -   Look for installed Windows 10 sdk's during installation instead of relying on specific versions.
 
 ### Fixed
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -382,12 +382,9 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
                     return ToArray(value, typeof(object[]), out result, setError);
                 }
 
-                if (setError)
-                {
-                    Exceptions.SetError(Exceptions.TypeError, "value cannot be converted to Object");
-                }
-
-                return false;
+                Runtime.XIncref(value); // PyObject() assumes ownership
+                result = new PyObject(value);
+                return true;
             }
 
             // Conversion to 'Type' is done using the same mappings as above for objects.

Original file line number	Diff line number	Diff line change
`@@ -382,12 +382,9 @@ internal static bool ToManagedValue(IntPtr value, Type obType,`
`382`	`382`	`return ToArray(value, typeof(object[]), out result, setError);`
`383`	`383`	`}`
`384`	`384`
`385`		`- if (setError)`
`386`		`- {`
`387`		`- Exceptions.SetError(Exceptions.TypeError, "value cannot be converted to Object");`
`388`		`- }`
`389`		`-`
`390`		`- return false;`
	`385`	`+ Runtime.XIncref(value); // PyObject() assumes ownership`
	`386`	`+ result = new PyObject(value);`
	`387`	`+ return true;`
`391`	`388`	`}`
`392`	`389`
`393`	`390`	`// Conversion to 'Type' is done using the same mappings as above for objects.`