use new function instead

koubaa · koubaa · commit 7951d499b2c0 · 2020-04-22T10:14:36.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,7 +26,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   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])
 -   Added support for kwarg parameters when calling .NET methods from Python
 -   Changed method for finding MSBuild using vswhere
--   Allow conversion to C# object in PyObject.As<object>
+-   Allow conversion to C# object in PyObject.As2<object>
 
 ### Fixed
 
diff --git a/src/embed_tests/TestConverter.cs b/src/embed_tests/TestConverter.cs
@@ -71,10 +71,10 @@ public void RawPyObjectProxy()
         [Test]
         public void ConvertToObject()
         {
-            object pyInt = new PyInt(12).As<object>();
+            object pyInt = new PyInt(12).As2<object>();
             Assert.AreSame(pyInt.GetType(), typeof(int));
 
-            object pyString = new PyString("hello").As<object>();
+            object pyString = new PyString("hello").As2<object>();
             Assert.AreSame(pyString.GetType(), typeof(string));
         }
     }
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -155,6 +155,20 @@ public object AsManagedObject(Type t)
         /// value of the Python object.
         /// </remarks>
         public T As<T>()
+        {
+            if (typeof(T) == typeof(PyObject) || typeof(T) == typeof(object))
+            {
+                return (T)(this as object);
+            }
+            object result;
+            if (!Converter.ToManaged(obj, typeof(T), out result, false))
+            {
+                throw new InvalidCastException("cannot convert object to target type");
+            }
+            return (T)result;
+        }
+
+        public T As2<T>()
         {
             if (typeof(T) == typeof(PyObject))
             {

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,10 @@ public void RawPyObjectProxy()`
`71`	`71`	`[Test]`
`72`	`72`	`public void ConvertToObject()`
`73`	`73`	`{`
`74`		`- object pyInt = new PyInt(12).As<object>();`
	`74`	`+ object pyInt = new PyInt(12).As2<object>();`
`75`	`75`	`Assert.AreSame(pyInt.GetType(), typeof(int));`
`76`	`76`
`77`		`- object pyString = new PyString("hello").As<object>();`
	`77`	`+ object pyString = new PyString("hello").As2<object>();`
`78`	`78`	`Assert.AreSame(pyString.GetType(), typeof(string));`
`79`	`79`	`}`
`80`	`80`	`}`