Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add object type to methodbind
  • Loading branch information
vmuriart committed Feb 22, 2017
commit 2cabc9f623dac83d83f0798102510670299fbbaf
2 changes: 1 addition & 1 deletion src/runtime/methodbinder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/tests/test_method.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down