property descriptor made visible on the reflected class for instance properties

lostmsu · lostmsu · commit d821b352df28 · 2021-08-06T09:23:02.000-07:00
diff --git a/src/embed_tests/Inspect.cs b/src/embed_tests/Inspect.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+
+using NUnit.Framework;
+
+using Python.Runtime;
+
+namespace Python.EmbeddingTest
+{
+    public class Inspect
+    {
+        [OneTimeSetUp]
+        public void SetUp()
+        {
+            PythonEngine.Initialize();
+        }
+
+        [OneTimeTearDown]
+        public void Dispose()
+        {
+            PythonEngine.Shutdown();
+        }
+
+        [Test]
+        public void InstancePropertiesVisibleOnClass()
+        {
+            var uri = new Uri("http://example.org").ToPython();
+            var uriClass = uri.GetPythonType();
+            var property = uriClass.GetAttr(nameof(Uri.AbsoluteUri));
+            var pyProp = (PropertyObject)ManagedType.GetManagedObject(property.Reference);
+            Assert.AreEqual(nameof(Uri.AbsoluteUri), pyProp.info.Value.Name);
+        }
+    }
+}
diff --git a/src/runtime/propertyobject.cs b/src/runtime/propertyobject.cs
@@ -11,7 +11,7 @@ namespace Python.Runtime
     [Serializable]
     internal class PropertyObject : ExtensionType
     {
-        private MaybeMemberInfo<PropertyInfo> info;
+        internal MaybeMemberInfo<PropertyInfo> info;
         private MaybeMethodInfo getter;
         private MaybeMethodInfo setter;
 
@@ -50,9 +50,9 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
             {
                 if (!getter.IsStatic)
                 {
-                    Exceptions.SetError(Exceptions.TypeError,
-                        "instance property must be accessed through a class instance");
-                    return IntPtr.Zero;
+                    Runtime.XIncref(ds);
+                    // unbound property
+                    return ds;
                 }
 
                 try

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Python.Runtime`
`11`	`11`	`[Serializable]`
`12`	`12`	`internal class PropertyObject : ExtensionType`
`13`	`13`	`{`
`14`		`- private MaybeMemberInfo<PropertyInfo> info;`
	`14`	`+ internal MaybeMemberInfo<PropertyInfo> info;`
`15`	`15`	`private MaybeMethodInfo getter;`
`16`	`16`	`private MaybeMethodInfo setter;`
`17`	`17`
`@@ -50,9 +50,9 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)`
`50`	`50`	`{`
`51`	`51`	`if (!getter.IsStatic)`
`52`	`52`	`{`
`53`		`- Exceptions.SetError(Exceptions.TypeError,`
`54`		`- "instance property must be accessed through a class instance");`
`55`		`- return IntPtr.Zero;`
	`53`	`+ Runtime.XIncref(ds);`
	`54`	`+ // unbound property`
	`55`	`+ return ds;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`try`