pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-12 17:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: enable py::implicitly_convertible<py::none, ...> for py::class_-wrapped types (#3059)

Browse Source 
* Allow casting from None to a custom object, closes #2778

* ci.yml patch from the smart_holder branch for full CI coverage.
This commit is contained in:
Cris Luengo
2021-06-25 18:56:17 -06:00
committed by Ralf W. Grosse-Kunstleve
parent cfc06838fd
commit 57a36633c4
3 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/pybind11/detail/type_caster_base.h
View File

@@ -657,12 +657,6 @@ public:
PYBIND11_NOINLINE bool load_impl(handle src, bool convert) {
if (!src) return false;
if (!typeinfo) return try_load_foreign_module_local(src);
if (src.is_none()) {
// Defer accepting None to other overloads (if we aren't in convert mode):
if (!convert) return false;
value = nullptr;
return true;
}
auto &this_ = static_cast<ThisT &>(*this);
this_.check_holder_compat();
@@ -731,7 +725,19 @@ public:
}
// Global typeinfo has precedence over foreign module_local
return try_load_foreign_module_local(src);
if (try_load_foreign_module_local(src)) {
return true;
}
// Custom converters didn't take None, now we convert None to nullptr.
if (src.is_none()) {
// Defer accepting None to other overloads (if we aren't in convert mode):
if (!convert) return false;
value = nullptr;
return true;
}
return false;
}