From 1b52246f5d6992d94210b29b0594f3d120e25681 Mon Sep 17 00:00:00 2001
From: Ben Pritchard <ben@bennyp.org>
Date: Thu, 10 Mar 2016 16:31:38 -0500
Subject: [PATCH] Better testing for callable python functions

---
 example/example5.py           | 6 ++++++
 example/example5.ref          | 4 ++++
 include/pybind11/functional.h | 2 +-
 include/pybind11/pytypes.h    | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/example/example5.py b/example/example5.py
index 0699978d2..ef90cfd07 100755
--- a/example/example5.py
+++ b/example/example5.py
@@ -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()
diff --git a/example/example5.ref b/example/example5.ref
index d1da88311..bfc3cb26e 100644
--- a/example/example5.ref
+++ b/example/example5.ref
@@ -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
diff --git a/include/pybind11/functional.h b/include/pybind11/functional.h
index 95ac7c92c..f00a60379 100644
--- a/include/pybind11/functional.h
+++ b/include/pybind11/functional.h
@@ -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 {
diff --git a/include/pybind11/pytypes.h b/include/pybind11/pytypes.h
index dd86bbbf2..8e5cdc6ef 100644
--- a/include/pybind11/pytypes.h
+++ b/include/pybind11/pytypes.h
@@ -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());