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

functional.h: support more kinds of Python functions

Browse Source
This commit is contained in:
Wenzel Jakob 2015-11-16 18:39:43 +01:00
parent 3ee91b2f0a
commit eb7c0b82ec
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/pybind11/functional.h
View File

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

24
include/pybind11/pytypes.h
View File

@ -94,6 +94,18 @@ private:
}; };
NAMESPACE_BEGIN(detail) NAMESPACE_BEGIN(detail)
inline PyObject *get_function(PyObject *value) {
if (value == nullptr)
return nullptr;
#if PY_MAJOR_VERSION >= 3
if (PyInstanceMethod_Check(value))
value = PyInstanceMethod_GET_FUNCTION(value);
#endif
if (PyMethod_Check(value))
value = PyMethod_GET_FUNCTION(value);
return value;
}
class accessor { class accessor {
public: public:
accessor(PyObject *obj, PyObject *key, bool attr) accessor(PyObject *obj, PyObject *key, bool attr)
@ -346,16 +358,8 @@ public:
PYBIND11_OBJECT_DEFAULT(function, object, PyFunction_Check) PYBIND11_OBJECT_DEFAULT(function, object, PyFunction_Check)
bool is_cpp_function() { bool is_cpp_function() {
PyObject *ptr = m_ptr; PyObject *ptr = detail::get_function(m_ptr);
if (ptr == nullptr) return ptr != nullptr && PyCFunction_Check(ptr);
return false;
#if PY_MAJOR_VERSION >= 3
if (PyInstanceMethod_Check(ptr))
ptr = PyInstanceMethod_GET_FUNCTION(ptr);
#endif
if (PyMethod_Check(ptr))
ptr = PyMethod_GET_FUNCTION(ptr);
return PyCFunction_Check(ptr);
} }
}; };