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

Better testing for callable python functions

Browse Source
This commit is contained in:
Ben Pritchard 2016-03-10 16:31:38 -05:00
parent 17cdb06c1b
commit 1b52246f5d
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/example5.py
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python
from __future__ import print_function
from functools import partial
import sys
sys.path.append('.')
@ -37,8 +38,13 @@ def func2(a, b, c, d):
print('Callback function 2 called : ' + str(a) + ", " + str(b) + ", " + str(c) + ", "+ str(d))
return d
def func3(a):
print('Callback function 3 called : ' + str(a))
print(test_callback1(func1))
print(test_callback2(func2))
print(test_callback1(partial(func2, "Hello", "from", "partial", "object")))
print(test_callback1(partial(func3, "Partial object with one argument")))
test_callback3(lambda i: i + 1)
f = test_callback4()

4
example/example5.ref
View File

@ -19,4 +19,8 @@ Callback function 1 called!
False
Callback function 2 called : Hello, x, True, 5
5
Callback function 2 called : Hello, from, partial, object
False
Callback function 3 called : Partial object with one argument
False
func(43) = 44

2
include/pybind11/functional.h
View File

@ -20,7 +20,7 @@ template <typename Return, typename... Args> struct type_caster<std::function<Re
public:
bool load(handle src_, bool) {
src_ = detail::get_function(src_);
if (!src_ || !(PyFunction_Check(src_.ptr()) || PyCFunction_Check(src_.ptr())))
if (!src_ || !PyCallable_Check(src_.ptr()))
return false;
object src(src_, true);
value = [src](Args... args) -> Return {

2
include/pybind11/pytypes.h
View File

@ -428,7 +428,7 @@ public:
class function : public object {
public:
PYBIND11_OBJECT_DEFAULT(function, object, PyFunction_Check)
PYBIND11_OBJECT_DEFAULT(function, object, PyCallable_Check)
bool is_cpp_function() const {
handle fun = detail::get_function(m_ptr);
return fun && PyCFunction_Check(fun.ptr());