Add object type to methodbind

vmuriart · vmuriart · commit 197d34e9af4a · 2017-02-20T20:45:07.000-07:00
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -375,7 +375,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
                             if (clrtype != null)
                             {
                                 var typematch = false;
-                                if (pi[n].ParameterType != clrtype)
+                                if ((pi[n].ParameterType != typeof(object)) && (pi[n].ParameterType != clrtype))
                                 {
                                     IntPtr pytype = Converter.GetPythonTypeByAlias(pi[n].ParameterType);
                                     pyoptype = Runtime.PyObject_Type(op);
diff --git a/src/tests/test_method.py b/src/tests/test_method.py
@@ -781,7 +781,6 @@ def test_no_object_in_param():
         MethodTest.TestOverloadedNoObject("test")
 
 
-@pytest.mark.xfail(reason="Needs fixing. #203")
 def test_object_in_param():
     """Test regression introduced by #151 in which Object method overloads
     aren't being used. See #203 for issue."""

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth`
`375`	`375`	`if (clrtype != null)`
`376`	`376`	`{`
`377`	`377`	`var typematch = false;`
`378`		`- if (pi[n].ParameterType != clrtype)`
	`378`	`+ if ((pi[n].ParameterType != typeof(object)) && (pi[n].ParameterType != clrtype))`
`379`	`379`	`{`
`380`	`380`	`IntPtr pytype = Converter.GetPythonTypeByAlias(pi[n].ParameterType);`
`381`	`381`	`pyoptype = Runtime.PyObject_Type(op);`