Merge branch 'master' into PR/PyArgConverter

filmor · web-flow · commit b5b0c69bad1e · 2019-06-20T19:32:06.000+02:00
diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj
@@ -89,7 +89,6 @@
     <Compile Include="TestDomainReload.cs" />
     <Compile Include="TestExample.cs" />
     <Compile Include="TestFinalizer.cs" />
-    <Compile Include="TestInstanceWrapping.cs" />
     <Compile Include="TestPyAnsiString.cs" />
     <Compile Include="TestPyFloat.cs" />
     <Compile Include="TestPyInt.cs" />
diff --git a/src/embed_tests/TestFinalizer.cs b/src/embed_tests/TestFinalizer.cs
@@ -45,7 +45,7 @@ public void CollectBasicObject()
                 called = true;
             };
 
-            Assert.IsFalse(called);
+            Assert.IsFalse(called, "The event handler was called before it was installed");
             Finalizer.Instance.CollectOnce += handler;
 
             WeakReference shortWeak;
@@ -55,13 +55,25 @@ public void CollectBasicObject()
             }
             FullGCCollect();
             // The object has been resurrected
-            Assert.IsFalse(shortWeak.IsAlive);
-            Assert.IsTrue(longWeak.IsAlive);
+            Warn.If(
+                shortWeak.IsAlive,
+                "The referenced object is alive although it should have been collected",
+                shortWeak
+            );
+            Assert.IsTrue(
+                longWeak.IsAlive,
+                "The reference object is not alive although it should still be",
+                longWeak
+            );
 
             {
                 var garbage = Finalizer.Instance.GetCollectedObjects();
-                Assert.NotZero(garbage.Count);
-                Assert.IsTrue(garbage.Any(T => ReferenceEquals(T.Target, longWeak.Target)));
+                Assert.NotZero(garbage.Count, "There should still be garbage around");
+                Warn.Unless(
+                    garbage.Any(T => ReferenceEquals(T.Target, longWeak.Target)),
+                    $"The {nameof(longWeak)} reference doesn't show up in the garbage list",
+                    garbage
+                );
             }
             try
             {
@@ -71,7 +83,7 @@ public void CollectBasicObject()
             {
                 Finalizer.Instance.CollectOnce -= handler;
             }
-            Assert.IsTrue(called);
+            Assert.IsTrue(called, "The event handler was not called during finalization");
             Assert.GreaterOrEqual(objectCount, 1);
         }
 
diff --git a/src/embed_tests/TestInstanceWrapping.cs b/src/embed_tests/TestInstanceWrapping.cs
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -382,9 +382,12 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
                     return ToArray(value, typeof(object[]), out result, setError);
                 }
 
-                Runtime.XIncref(value); // PyObject() assumes ownership
-                result = new PyObject(value);
-                return true;
+                if (setError)
+                {
+                    Exceptions.SetError(Exceptions.TypeError, "value cannot be converted to Object");
+                }
+
+                return false;
             }
 
             // Conversion to 'Type' is done using the same mappings as above for objects.

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