Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-29 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

type_caster<std::function>: allow None values in both directions

Browse Source
This commit is contained in:
Wenzel Jakob 2016-08-18 11:18:12 +02:00
parent 0b63231bae
commit 8de0437e46
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
example/example-callbacks.cpp
View File

@ -38,7 +38,10 @@ py::cpp_function test_callback5() {
int dummy_function(int i) { return i + 1; } int dummy_function(int i) { return i + 1; }
int dummy_function2(int i, int j) { return i + j; } int dummy_function2(int i, int j) { return i + j; }
std::function<int(int)> roundtrip(std::function<int(int)> f) { std::function<int(int)> roundtrip(std::function<int(int)> f) {
std::cout << "roundtrip.." << std::endl; if (!f)
std::cout << "roundtrip (got None).." << std::endl;
else
std::cout << "roundtrip.." << std::endl;
return f; return f;
} }

2
example/example-callbacks.py
View File

@ -68,6 +68,8 @@ from example import roundtrip
test_dummy_function(dummy_function) test_dummy_function(dummy_function)
test_dummy_function(roundtrip(dummy_function)) test_dummy_function(roundtrip(dummy_function))
if roundtrip(None) is not None:
print("Problem!")
test_dummy_function(lambda x: x + 2) test_dummy_function(lambda x: x + 2)
try: try:

1
example/example-callbacks.ref
View File

@ -30,6 +30,7 @@ Copy constructions: 1
Move constructions: True Move constructions: True
argument matches dummy_function argument matches dummy_function
eval(1) = 2 eval(1) = 2
roundtrip (got None)..
roundtrip.. roundtrip..
argument matches dummy_function argument matches dummy_function
eval(1) = 2 eval(1) = 2

6
include/pybind11/functional.h
View File

@ -20,6 +20,9 @@ template <typename Return, typename... Args> struct type_caster<std::function<Re
typedef typename std::conditional<std::is_same<Return, void>::value, void_type, Return>::type retval_type; typedef typename std::conditional<std::is_same<Return, void>::value, void_type, Return>::type retval_type;
public: public:
bool load(handle src_, bool) { bool load(handle src_, bool) {
if (src_.ptr() == Py_None)
return true;
src_ = detail::get_function(src_); src_ = detail::get_function(src_);
if (!src_ || !PyCallable_Check(src_.ptr())) if (!src_ || !PyCallable_Check(src_.ptr()))
return false; return false;
@ -58,6 +61,9 @@ public:
template <typename Func> template <typename Func>
static handle cast(Func &&f_, return_value_policy policy, handle /* parent */) { static handle cast(Func &&f_, return_value_policy policy, handle /* parent */) {
if (!f_)
return handle(Py_None).inc_ref();
auto result = f_.template target<Return (*)(Args...)>(); auto result = f_.template target<Return (*)(Args...)>();
if (result) if (result)
return cpp_function(*result, policy).release(); return cpp_function(*result, policy).release();