Skip to content

Fixed #296 Converter support for PyObject #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 16, 2016
Merged

Fixed #296 Converter support for PyObject #297

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7d132c9
Fixed #296
rmadsen-ks Nov 29, 2016
2f367c0
Merge branch 'master' into fix/develop/296-convert-PyObject
rmadsen-ks Nov 30, 2016
bb73ed1
Added test for #296
rmadsen-ks Nov 30, 2016
8d9d754
merged with master.
rmadsen-ks Nov 30, 2016
d5951f6
removed windows line endings
rmadsen-ks Dec 1, 2016
335cd37
Fixed comment and removed \r from added source
rmadsen-ks Dec 5, 2016
9033894
Merge branch 'master' into fix/develop/296-convert-PyObject
rmadsen-ks Dec 8, 2016
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
17 changes: 15 additions & 2 deletions src/runtime/converter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ internal static IntPtr ToPython<T>(T value)

internal static IntPtr ToPython(Object value, Type type)
{
if(value is PyObject)
{
IntPtr handle = ((PyObject)value).Handle;
Runtime.XIncref(handle);
return handle;
}
IntPtr result = IntPtr.Zero;

// Null always converts to None in Python.
Expand Down Expand Up @@ -265,8 +271,15 @@ internal static bool ToManaged(IntPtr value, Type type,
internal static bool ToManagedValue(IntPtr value, Type obType,
out Object result, bool setError)
{
// Common case: if the Python value is a wrapped managed object
// instance, just return the wrapped object.
if (obType == typeof(PyObject))
{
Runtime.XIncref(value); // PyObject() assumes ownership
result = new PyObject(value);
return true;
}

// Common case: if the Python value is a wrapped managed object
// instance, just return the wrapped object.
ManagedType mt = ManagedType.GetManagedObject(value);
result = null;

Expand Down
14 changes: 14 additions & 0 deletions src/testing/callbacktest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,19 @@ public string Call_simpleDefaultArg_WithEmptyArgs(string moduleName)
return module.simpleDefaultArg();
}
}
}

//==========================================================================
// Tests calling from Python into C# and back into Python using a PyObject.
// SelfCallbackTest should be inherited from a Python class.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very minor nitpick, but shouldn't that read "inherited by a Python class"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment has been changed.

// Used in test_class.py / testCallback
//==========================================================================
public class SelfCallbackTest
{
public void Callback(Runtime.PyObject self)
{
using (Runtime.Py.GIL())
((dynamic)self).PyCallback(self);
}
}
}
17 changes: 16 additions & 1 deletion src/tests/test_class.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import System
import six
from Python.Test import ClassTest
from System.Collections import Hashtable
from System.Collections import Hashtable
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is this needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was not needed by me, but it seems I had added a windows line-ending. Its fixed now.


if six.PY3:
DictProxyType = type(object.__dict__)
Expand Down Expand Up @@ -250,6 +250,21 @@ def testComparisons(self):
c2 = ClassTest()
self.assertRaises(TypeError, lambda: c1 < c2)

def testSelfCallback(self):
""" Test calling back and forth between this and a c# baseclass."""
class CallbackUser(Test.SelfCallbackTest):
def DoCallback(self):
self.PyCallbackWasCalled = False
self.SameReference = False
return self.Callback(self)
def PyCallback(self, self2):
self.PyCallbackWasCalled = True
self.SameReference = self == self2

testobj = CallbackUser()
testobj.DoCallback()
self.assertTrue(testobj.PyCallbackWasCalled)
self.assertTrue(testobj.SameReference)

class ClassicClass:
def kind(self):
Expand Down