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

pybind11: implicitly convert NumPy integer scalars

Browse Source 
The current integer caster was unnecessarily strict and rejected
various kinds of NumPy integer types when calling C++ functions
expecting normal integers. This relaxes the current behavior.
This commit is contained in:
Wenzel Jakob 2016-10-28 00:37:07 +02:00
parent a6f85eb985
commit 496feacfd0
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/pybind11/cast.h
View File

@ -443,7 +443,14 @@ public:
(std::is_integral<T>::value && sizeof(py_type) != sizeof(T) &&
(py_value < (py_type) std::numeric_limits<T>::min() ||
py_value > (py_type) std::numeric_limits<T>::max()))) {
#if PY_VERSION_HEX < 0x03000000
bool type_error = PyErr_ExceptionMatches(PyExc_SystemError);
#else
bool type_error = PyErr_ExceptionMatches(PyExc_TypeError);
#endif
PyErr_Clear();
if (type_error && PyNumber_Check(src.ptr()))
return load(object(PyNumber_Long(src.ptr()), true), false);
return false;
}

2
tests/test_numpy_array.cpp
View File

@ -124,4 +124,6 @@ test_initializer numpy_array([](py::module &m) {
return py::array_t<int>({2}, {4}, a.data, obj);
}
);
sm.def("function_taking_uint64", [](uint64_t){ });
});

7
tests/test_numpy_array.py
View File

@ -238,3 +238,10 @@ def test_numpy_view(capture):
assert capture == """
~ArrayClass()
"""
@pytest.requires_numpy
def test_cast_numpy_int64_to_uint64():
from pybind11_tests.array import function_taking_uint64
function_taking_uint64(123)
function_taking_uint64(np.uint64(123))