fixed PyObject.As<object> returning PyObject

lostmsu · lostmsu · commit 93e0bdb9dbe5 · 2021-09-14T12:28:43.000-07:00
diff --git a/src/embed_tests/Codecs.cs b/src/embed_tests/Codecs.cs
@@ -373,6 +373,31 @@ from datetime import datetime
 
         public static void AcceptsDateTime(DateTime v) {}
 
+        [Test]
+        public void As_Object_AffectedByDecoders()
+        {
+            var everythingElseToSelf = new EverythingElseToSelfDecoder();
+            PyObjectConversions.RegisterDecoder(everythingElseToSelf);
+
+            var pyObj = PythonEngine.Eval("iter");
+            var decoded = pyObj.As<object>();
+            Assert.AreSame(everythingElseToSelf, decoded);
+        }
+
+        public class EverythingElseToSelfDecoder : IPyObjectDecoder
+        {
+            public bool CanDecode(PyObject objectType, Type targetType)
+            {
+                return targetType.IsAssignableFrom(typeof(EverythingElseToSelfDecoder));
+            }
+
+            public bool TryDecode<T>(PyObject pyObj, out T value)
+            {
+                value = (T)(object)this;
+                return true;
+            }
+        }
+
         class ValueErrorWrapper : Exception
         {
             public ValueErrorWrapper(string message) : base(message) { }
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -163,20 +163,10 @@ public object AsManagedObject(Type t)
         }
 
         /// <summary>
-        /// As Method
-        /// </summary>
-        /// <remarks>
         /// Return a managed object of the given type, based on the
         /// value of the Python object.
-        /// </remarks>
-        public T As<T>()
-        {
-            if (typeof(T) == typeof(PyObject) || typeof(T) == typeof(object))
-            {
-                return (T)(this as object);
-            }
-            return (T)AsManagedObject(typeof(T));
-        }
+        /// </summary>
+        public T As<T>() => (T)this.AsManagedObject(typeof(T));
 
         internal bool IsDisposed => obj == IntPtr.Zero;
 
