type_caster_generic::load(): accept Py_None as input

a3861b54 · Wenzel Jakob · cf2b87aa · a3861b54
Commit a3861b54 authored Feb 23, 2016 by Wenzel Jakob
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

include/pybind11/cast.h include/pybind11/cast.h +4 -1

No files found.
--- a/include/pybind11/cast.h
+++ b/include/pybind11/cast.h
@@ -102,7 +102,10 @@ public:
    PYBIND11_NOINLINE bool load(handle src, bool convert) {
        if (!src || !typeinfo)
            return false;
-        if (PyType_IsSubtype(Py_TYPE(src.ptr()), typeinfo->type)) {
+        if (src.ptr() == Py_None) {
+            value = nullptr;
+            return true;
+        } else if (PyType_IsSubtype(Py_TYPE(src.ptr()), typeinfo->type)) {
            value = ((instance<void> *) src.ptr())->value;
            return true;
        }