@@ -50,6 +50,32 @@ public class Fixture
 
             public static readonly string PublicStaticReadOnlyField = "Default value";
             protected static readonly string ProtectedStaticReadOnlyField = "Default value";
+
+            public static Fixture Create()
+            {
+                return new Fixture();
+            }
+        }
+
+        [Test]
+        public void TestPublicStaticMethodWorks()
+        {
+            dynamic model = PythonEngine.ModuleFromString("module", @"
+from clr import AddReference
+AddReference(""System"")
+AddReference(""Python.EmbeddingTest"")
+
+from Python.EmbeddingTest import *
+
+class TestPublicStaticMethodWorks:
+    def GetValue(self):
+        return TestPropertyAccess.Fixture.Create()
+").GetAttr("TestPublicStaticMethodWorks").Invoke();
+
+            using (Py.GIL())
+            {
+                Assert.AreEqual("Default value", model.GetValue().PublicProperty.ToString());
+            }
         }
 
         [Test]
 
@@ -57,7 +57,7 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
                 }
                 try
                 {
-                    result = self.GetMemberGetter(info.DeclaringType)(null);
+                    result = self.GetMemberGetter(info.DeclaringType)(info.DeclaringType);
                     return Converter.ToPython(result, info.FieldType);
                 }
                 catch (Exception e)
@@ -151,7 +151,7 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
                 }
                 else
                 {
-                    self.GetMemberSetter(info.DeclaringType)(null, newval);
+                    self.GetMemberSetter(info.DeclaringType)(info.DeclaringType, newval);
                 }
                 return 0;
             }
 
@@ -66,7 +66,7 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
 
                 try
                 {
-                    result = self.GetMemberGetter(info.DeclaringType)(null);
+                    result = self.GetMemberGetter(info.DeclaringType)(info.DeclaringType);
                     return Converter.ToPython(result, info.PropertyType);
                 }
                 catch (Exception e)
@@ -156,11 +156,11 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
                         return -1;
                     }
 
-                    self.GetMemberSetter(info.DeclaringType)(co.inst, newval);
+                    self.GetMemberSetter(co.inst.GetType())(co.inst, newval);
                 }
                 else
                 {
-                    self.GetMemberSetter(info.DeclaringType)(null, newval);
+                    self.GetMemberSetter(info.DeclaringType)(info.DeclaringType, newval);
                 }
                 return 0;
             }
Original file line number	Diff line number	Diff line change
@@ -57,7 +57,7 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
57	57	}
58	58	try
59	59	{
60		- result = self.GetMemberGetter(info.DeclaringType)(null);
	60	+ result = self.GetMemberGetter(info.DeclaringType)(info.DeclaringType);
61	61	return Converter.ToPython(result, info.FieldType);
62	62	}
63	63	catch (Exception e)
@@ -151,7 +151,7 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
151	151	}
152	152	else
153	153	{
154		- self.GetMemberSetter(info.DeclaringType)(null, newval);
	154	+ self.GetMemberSetter(info.DeclaringType)(info.DeclaringType, newval);
155	155	}
156	156	return 0;
157	157	}
Original file line number	Diff line number	Diff line change
@@ -66,7 +66,7 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
66	66
67	67	try
68	68	{
69		- result = self.GetMemberGetter(info.DeclaringType)(null);
	69	+ result = self.GetMemberGetter(info.DeclaringType)(info.DeclaringType);
70	70	return Converter.ToPython(result, info.PropertyType);
71	71	}
72	72	catch (Exception e)
@@ -156,11 +156,11 @@ public static IntPtr tp_descr_get(IntPtr ds, IntPtr ob, IntPtr tp)
156	156	return -1;
157	157	}
158	158
159		- self.GetMemberSetter(info.DeclaringType)(co.inst, newval);
	159	+ self.GetMemberSetter(co.inst.GetType())(co.inst, newval);
160	160	}
161	161	else
162	162	{
163		- self.GetMemberSetter(info.DeclaringType)(null, newval);
	163	+ self.GetMemberSetter(info.DeclaringType)(info.DeclaringType, newval);
164	164	}
165	165	return 0;
166	166	}