property descriptor made visible on the reflected class for instance properties

lostmsu · lostmsu · commit 8b74b3188c80 · 2020-10-23T12:08:03.000-07:00
diff --git a/src/embed_tests/Inspect.cs b/src/embed_tests/Inspect.cs
@@ -26,6 +26,15 @@ public void BoundMethodsAreInspectable() {
             }
         }
 
+        [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 = ManagedType.GetManagedObject<PropertyObject>(property.Reference);
+            Assert.AreEqual(nameof(Uri.AbsoluteUri), pyProp.info.Name);
+        }
+
         class Class {
             public void Method(int a, int b = 10) { }
             public void Method(int a, object b) { }
diff --git a/src/runtime/propertyobject.cs b/src/runtime/propertyobject.cs
@@ -9,7 +9,7 @@ namespace Python.Runtime
     /// </summary>
     internal class PropertyObject : ExtensionType
     {
-        private PropertyInfo info;
+        internal PropertyInfo info;
         private MethodInfo getter;
         private MethodInfo setter;
 
@@ -44,9 +44,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
`@@ -9,7 +9,7 @@ namespace Python.Runtime`
`9`	`9`	`/// </summary>`
`10`	`10`	`internal class PropertyObject : ExtensionType`
`11`	`11`	`{`
`12`		`- private PropertyInfo info;`
	`12`	`+ internal PropertyInfo info;`
`13`	`13`	`private MethodInfo getter;`
`14`	`14`	`private MethodInfo setter;`
`15`	`15`
`@@ -44,9 +44,9 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)`
`44`	`44`	`{`
`45`	`45`	`if (!getter.IsStatic)`
`46`	`46`	`{`
`47`		`- Exceptions.SetError(Exceptions.TypeError,`
`48`		`- "instance property must be accessed through a class instance");`
`49`		`- return IntPtr.Zero;`
	`47`	`+ Runtime.XIncref(ds);`
	`48`	`+ // unbound property`
	`49`	`+ return ds;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`try`