pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-24 23:07:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing error handling to module_::def_submodule (#3973)

Browse Source 
* Add missing error handling to module_::def_submodule

* Add test_def_submodule_failures

* PyPy only: Skip test with trigger for PyModule_GetName() failure.

* Reapply minor fix that accidentally got lost in transfer from PR #3964
This commit is contained in:
Ralf W. Grosse-Kunstleve
2022-05-28 16:40:57 -07:00
committed by GitHub
parent 68f8010500
commit 748ae2270b
3 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/pybind11/pybind11.h
View File

@@ -1173,9 +1173,16 @@ public:
py::module_ m3 = m2.def_submodule("subsub", "A submodule of 'example.sub'");
\endrst */
module_ def_submodule(const char *name, const char *doc = nullptr) {
std::string full_name
= std::string(PyModule_GetName(m_ptr)) + std::string(".") + std::string(name);
auto result = reinterpret_borrow<module_>(PyImport_AddModule(full_name.c_str()));
const char *this_name = PyModule_GetName(m_ptr);
if (this_name == nullptr) {
throw error_already_set();
}
std::string full_name = std::string(this_name) + '.' + name;
handle submodule = PyImport_AddModule(full_name.c_str());
if (!submodule) {
throw error_already_set();
}
auto result = reinterpret_borrow<module_>(submodule);
if (doc && options::show_user_defined_docstrings()) {
result.attr("__doc__") = pybind11::str(doc);
}