mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-26 23:22:01 +00:00
1682b67326
`error_already_set` is more complicated than it needs to be, partly because it manages reference counts itself rather than using `py::object`, and partly because it tries to do more exception clearing than is needed. This commit greatly simplifies it, and fixes #927. Using `py::object` instead of `PyObject *` means we can rely on implicit copy/move constructors. The current logic did both a `PyErr_Clear` on deletion *and* a `PyErr_Fetch` on creation. I can't see how the `PyErr_Clear` on deletion is ever useful: the `Fetch` on creation itself clears the error, so the only way doing a `PyErr_Clear` on deletion could do anything if is some *other* exception was raised while the `error_already_set` object was alive--but in that case, clearing some other exception seems wrong. (Code that is worried about an exception handler raising another exception would already catch a second `error_already_set` from exception code). The destructor itself called `clear()`, but `clear()` was a little bit more paranoid that needed: it called `restore()` to restore the currently captured error, but then immediately cleared it, using the `PyErr_Restore` to release the references. That's unnecessary: it's valid for us to release the references manually. This updates the code to simply release the references on the three objects (preserving the gil acquire). `clear()`, however, also had the side effect of clearing the current error, even if the current `error_already_set` didn't have a current error (e.g. because of a previous `restore()` or `clear()` call). I don't really see how clearing the error here can ever actually be useful: the only way the current error could be set is if you called `restore()` (in which case the current stored error-related members have already been released), or if some *other* code raised the error, in which case `clear()` on *this* object is clearing an error for which it shouldn't be responsible. Neither of those seem like intentional or desirable features, and manually requesting deletion of the stored references similarly seems pointless, so I've just made `clear()` an empty method and marked it deprecated. This also fixes a minor potential issue with the destruction: it is technically possible for `value` to be null (though this seems likely to be rare in practice); this updates the check to look at `type` which will always be non-null for a `Fetch`ed exception. This also adds error_already_set round-trip throw tests to the test suite. |
||
|---|---|---|
| .. | ||
| test_cmake_build | ||
| test_embed | ||
| CMakeLists.txt | ||
| conftest.py | ||
| constructor_stats.h | ||
| object.h | ||
| pybind11_tests.cpp | ||
| pybind11_tests.h | ||
| pytest.ini | ||
| test_buffers.cpp | ||
| test_buffers.py | ||
| test_builtin_casters.cpp | ||
| test_builtin_casters.py | ||
| test_call_policies.cpp | ||
| test_call_policies.py | ||
| test_callbacks.cpp | ||
| test_callbacks.py | ||
| test_chrono.cpp | ||
| test_chrono.py | ||
| test_class.cpp | ||
| test_class.py | ||
| test_constants_and_functions.cpp | ||
| test_constants_and_functions.py | ||
| test_copy_move.cpp | ||
| test_copy_move.py | ||
| test_docstring_options.cpp | ||
| test_docstring_options.py | ||
| test_eigen.cpp | ||
| test_eigen.py | ||
| test_enum.cpp | ||
| test_enum.py | ||
| test_eval_call.py | ||
| test_eval.cpp | ||
| test_eval.py | ||
| test_exceptions.cpp | ||
| test_exceptions.py | ||
| test_kwargs_and_defaults.cpp | ||
| test_kwargs_and_defaults.py | ||
| test_methods_and_attributes.cpp | ||
| test_methods_and_attributes.py | ||
| test_modules.cpp | ||
| test_modules.py | ||
| test_multiple_inheritance.cpp | ||
| test_multiple_inheritance.py | ||
| test_numpy_array.cpp | ||
| test_numpy_array.py | ||
| test_numpy_dtypes.cpp | ||
| test_numpy_dtypes.py | ||
| test_numpy_vectorize.cpp | ||
| test_numpy_vectorize.py | ||
| test_opaque_types.cpp | ||
| test_opaque_types.py | ||
| test_operator_overloading.cpp | ||
| test_operator_overloading.py | ||
| test_pickling.cpp | ||
| test_pickling.py | ||
| test_pytypes.cpp | ||
| test_pytypes.py | ||
| test_sequences_and_iterators.cpp | ||
| test_sequences_and_iterators.py | ||
| test_smart_ptr.cpp | ||
| test_smart_ptr.py | ||
| test_stl_binders.cpp | ||
| test_stl_binders.py | ||
| test_stl.cpp | ||
| test_stl.py | ||
| test_virtual_functions.cpp | ||
| test_virtual_functions.py | ||