2016-06-17 21:35:59 +00:00
|
|
|
/*
|
2016-08-12 11:50:00 +00:00
|
|
|
tests/test_custom-exceptions.cpp -- exception translation
|
2016-06-17 21:35:59 +00:00
|
|
|
|
|
|
|
Copyright (c) 2016 Pim Schellart <P.Schellart@princeton.edu>
|
|
|
|
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
|
|
BSD-style license that can be found in the LICENSE file.
|
|
|
|
*/
|
2021-05-27 15:00:18 +00:00
|
|
|
#include "test_exceptions.h"
|
2021-06-22 16:11:54 +00:00
|
|
|
|
2021-07-21 12:22:18 +00:00
|
|
|
#include "local_bindings.h"
|
2016-08-12 11:50:00 +00:00
|
|
|
#include "pybind11_tests.h"
|
2022-02-10 20:17:07 +00:00
|
|
|
|
2022-01-14 19:22:47 +00:00
|
|
|
#include <exception>
|
|
|
|
#include <stdexcept>
|
2021-06-22 16:11:54 +00:00
|
|
|
#include <utility>
|
2016-06-17 21:35:59 +00:00
|
|
|
|
2018-01-09 17:30:19 +00:00
|
|
|
// A type that should be raised as an exception in Python
|
2016-06-17 21:35:59 +00:00
|
|
|
class MyException : public std::exception {
|
|
|
|
public:
|
2022-02-10 20:17:07 +00:00
|
|
|
explicit MyException(const char *m) : message{m} {}
|
|
|
|
const char *what() const noexcept override { return message.c_str(); }
|
|
|
|
|
2016-06-17 21:35:59 +00:00
|
|
|
private:
|
|
|
|
std::string message = "";
|
|
|
|
};
|
|
|
|
|
|
|
|
// A type that should be translated to a standard Python exception
|
|
|
|
class MyException2 : public std::exception {
|
|
|
|
public:
|
2022-02-10 20:17:07 +00:00
|
|
|
explicit MyException2(const char *m) : message{m} {}
|
|
|
|
const char *what() const noexcept override { return message.c_str(); }
|
|
|
|
|
2016-06-17 21:35:59 +00:00
|
|
|
private:
|
|
|
|
std::string message = "";
|
|
|
|
};
|
|
|
|
|
|
|
|
// A type that is not derived from std::exception (and is thus unknown)
|
|
|
|
class MyException3 {
|
|
|
|
public:
|
2022-02-10 20:17:07 +00:00
|
|
|
explicit MyException3(const char *m) : message{m} {}
|
|
|
|
virtual const char *what() const noexcept { return message.c_str(); }
|
2020-10-29 13:12:14 +00:00
|
|
|
// Rule of 5 BEGIN: to preempt compiler warnings.
|
2022-02-10 20:17:07 +00:00
|
|
|
MyException3(const MyException3 &) = default;
|
|
|
|
MyException3(MyException3 &&) = default;
|
|
|
|
MyException3 &operator=(const MyException3 &) = default;
|
|
|
|
MyException3 &operator=(MyException3 &&) = default;
|
2020-10-29 13:12:14 +00:00
|
|
|
virtual ~MyException3() = default;
|
|
|
|
// Rule of 5 END.
|
2016-06-17 21:35:59 +00:00
|
|
|
private:
|
|
|
|
std::string message = "";
|
|
|
|
};
|
|
|
|
|
|
|
|
// A type that should be translated to MyException
|
|
|
|
// and delegated to its exception translator
|
|
|
|
class MyException4 : public std::exception {
|
|
|
|
public:
|
2022-02-10 20:17:07 +00:00
|
|
|
explicit MyException4(const char *m) : message{m} {}
|
|
|
|
const char *what() const noexcept override { return message.c_str(); }
|
|
|
|
|
2016-06-17 21:35:59 +00:00
|
|
|
private:
|
|
|
|
std::string message = "";
|
|
|
|
};
|
|
|
|
|
2016-09-16 06:04:15 +00:00
|
|
|
// Like the above, but declared via the helper function
|
|
|
|
class MyException5 : public std::logic_error {
|
|
|
|
public:
|
|
|
|
explicit MyException5(const std::string &what) : std::logic_error(what) {}
|
|
|
|
};
|
|
|
|
|
|
|
|
// Inherits from MyException5
|
|
|
|
class MyException5_1 : public MyException5 {
|
|
|
|
using MyException5::MyException5;
|
|
|
|
};
|
|
|
|
|
2021-07-21 12:22:18 +00:00
|
|
|
// Exception that will be caught via the module local translator.
|
|
|
|
class MyException6 : public std::exception {
|
|
|
|
public:
|
2022-02-10 20:17:07 +00:00
|
|
|
explicit MyException6(const char *m) : message{m} {}
|
|
|
|
const char *what() const noexcept override { return message.c_str(); }
|
|
|
|
|
2021-07-21 12:22:18 +00:00
|
|
|
private:
|
|
|
|
std::string message = "";
|
|
|
|
};
|
|
|
|
|
2016-09-10 09:58:02 +00:00
|
|
|
struct PythonCallInDestructor {
|
CodeHealth: Enabling clang-tidy google-explicit-constructor (#3250)
* Adding google-explicit-constructor to .clang-tidy
* clang-tidy explicit attr.h (all automatic)
* clang-tidy explicit cast.h (all automatic)
* clang-tidy detail/init.h (1 NOLINT)
* clang-tidy detail/type_caster_base.h (2 NOLINT)
* clang-tidy pybind11.h (7 NOLINT)
* clang-tidy detail/common.h (3 NOLINT)
* clang-tidy detail/descr.h (2 NOLINT)
* clang-tidy pytypes.h (23 NOLINT, only 1 explicit)
* clang-tidy eigen.h (7 NOLINT, 0 explicit)
* Adding 2 explicit in functional.h
* Adding 4 explicit in iostream.h
* clang-tidy numpy.h (1 NOLINT, 1 explicit)
* clang-tidy embed.h (0 NOLINT, 1 explicit)
* clang-tidy tests/local_bindings.h (0 NOLINT, 4 explicit)
* clang-tidy tests/pybind11_cross_module_tests.cpp (0 NOLINT, 1 explicit)
* clang-tidy tests/pybind11_tests.h (0 NOLINT, 2 explicit)
* clang-tidy tests/test_buffers.cpp (0 NOLINT, 2 explicit)
* clang-tidy tests/test_builtin_casters.cpp (0 NOLINT, 4 explicit)
* clang-tidy tests/test_class.cpp (0 NOLINT, 6 explicit)
* clang-tidy tests/test_copy_move.cpp (0 NOLINT, 7 explicit)
* clang-tidy tests/test_embed/external_module.cpp (0 NOLINT, 1 explicit)
* clang-tidy tests/test_embed/test_interpreter.cpp (0 NOLINT, 1 explicit)
* clang-tidy tests/object.h (0 NOLINT, 2 explicit)
* clang-tidy batch of fully automatic fixes.
* Workaround for MSVC 19.16.27045.0 C++17 Python 2 C++ syntax error.
2021-09-09 01:53:38 +00:00
|
|
|
explicit PythonCallInDestructor(const py::dict &d) : d(d) {}
|
2016-12-12 22:42:52 +00:00
|
|
|
~PythonCallInDestructor() { d["good"] = true; }
|
2016-09-10 09:58:02 +00:00
|
|
|
|
|
|
|
py::dict d;
|
|
|
|
};
|
|
|
|
|
2020-08-08 10:07:14 +00:00
|
|
|
struct PythonAlreadySetInDestructor {
|
CodeHealth: Enabling clang-tidy google-explicit-constructor (#3250)
* Adding google-explicit-constructor to .clang-tidy
* clang-tidy explicit attr.h (all automatic)
* clang-tidy explicit cast.h (all automatic)
* clang-tidy detail/init.h (1 NOLINT)
* clang-tidy detail/type_caster_base.h (2 NOLINT)
* clang-tidy pybind11.h (7 NOLINT)
* clang-tidy detail/common.h (3 NOLINT)
* clang-tidy detail/descr.h (2 NOLINT)
* clang-tidy pytypes.h (23 NOLINT, only 1 explicit)
* clang-tidy eigen.h (7 NOLINT, 0 explicit)
* Adding 2 explicit in functional.h
* Adding 4 explicit in iostream.h
* clang-tidy numpy.h (1 NOLINT, 1 explicit)
* clang-tidy embed.h (0 NOLINT, 1 explicit)
* clang-tidy tests/local_bindings.h (0 NOLINT, 4 explicit)
* clang-tidy tests/pybind11_cross_module_tests.cpp (0 NOLINT, 1 explicit)
* clang-tidy tests/pybind11_tests.h (0 NOLINT, 2 explicit)
* clang-tidy tests/test_buffers.cpp (0 NOLINT, 2 explicit)
* clang-tidy tests/test_builtin_casters.cpp (0 NOLINT, 4 explicit)
* clang-tidy tests/test_class.cpp (0 NOLINT, 6 explicit)
* clang-tidy tests/test_copy_move.cpp (0 NOLINT, 7 explicit)
* clang-tidy tests/test_embed/external_module.cpp (0 NOLINT, 1 explicit)
* clang-tidy tests/test_embed/test_interpreter.cpp (0 NOLINT, 1 explicit)
* clang-tidy tests/object.h (0 NOLINT, 2 explicit)
* clang-tidy batch of fully automatic fixes.
* Workaround for MSVC 19.16.27045.0 C++17 Python 2 C++ syntax error.
2021-09-09 01:53:38 +00:00
|
|
|
explicit PythonAlreadySetInDestructor(const py::str &s) : s(s) {}
|
2020-08-08 10:07:14 +00:00
|
|
|
~PythonAlreadySetInDestructor() {
|
|
|
|
py::dict foo;
|
|
|
|
try {
|
|
|
|
// Assign to a py::object to force read access of nonexistent dict entry
|
|
|
|
py::object o = foo["bar"];
|
2022-02-10 20:17:07 +00:00
|
|
|
} catch (py::error_already_set &ex) {
|
2020-08-08 10:07:14 +00:00
|
|
|
ex.discard_as_unraisable(s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
py::str s;
|
|
|
|
};
|
|
|
|
|
2017-07-23 16:26:17 +00:00
|
|
|
TEST_SUBMODULE(exceptions, m) {
|
2022-02-10 20:17:07 +00:00
|
|
|
m.def("throw_std_exception",
|
|
|
|
[]() { throw std::runtime_error("This exception was intentionally thrown."); });
|
2017-06-08 22:44:49 +00:00
|
|
|
|
2016-06-17 21:35:59 +00:00
|
|
|
// make a new custom exception and use it as a translation target
|
|
|
|
static py::exception<MyException> ex(m, "MyException");
|
|
|
|
py::register_exception_translator([](std::exception_ptr p) {
|
|
|
|
try {
|
2022-02-08 00:23:20 +00:00
|
|
|
if (p) {
|
|
|
|
std::rethrow_exception(p);
|
|
|
|
}
|
2016-06-17 21:35:59 +00:00
|
|
|
} catch (const MyException &e) {
|
2016-09-16 06:04:15 +00:00
|
|
|
// Set MyException as the active python error
|
|
|
|
ex(e.what());
|
2016-06-17 21:35:59 +00:00
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// register new translator for MyException2
|
|
|
|
// no need to store anything here because this type will
|
|
|
|
// never by visible from Python
|
|
|
|
py::register_exception_translator([](std::exception_ptr p) {
|
|
|
|
try {
|
2022-02-08 00:23:20 +00:00
|
|
|
if (p) {
|
|
|
|
std::rethrow_exception(p);
|
|
|
|
}
|
2016-06-17 21:35:59 +00:00
|
|
|
} catch (const MyException2 &e) {
|
2016-09-16 06:04:15 +00:00
|
|
|
// Translate this exception to a standard RuntimeError
|
2016-06-17 21:35:59 +00:00
|
|
|
PyErr_SetString(PyExc_RuntimeError, e.what());
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// register new translator for MyException4
|
|
|
|
// which will catch it and delegate to the previously registered
|
|
|
|
// translator for MyException by throwing a new exception
|
|
|
|
py::register_exception_translator([](std::exception_ptr p) {
|
|
|
|
try {
|
2022-02-08 00:23:20 +00:00
|
|
|
if (p) {
|
|
|
|
std::rethrow_exception(p);
|
|
|
|
}
|
2016-06-17 21:35:59 +00:00
|
|
|
} catch (const MyException4 &e) {
|
|
|
|
throw MyException(e.what());
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
2016-09-16 06:04:15 +00:00
|
|
|
// A simple exception translation:
|
|
|
|
auto ex5 = py::register_exception<MyException5>(m, "MyException5");
|
|
|
|
// A slightly more complicated one that declares MyException5_1 as a subclass of MyException5
|
|
|
|
py::register_exception<MyException5_1>(m, "MyException5_1", ex5.ptr());
|
|
|
|
|
2022-02-10 20:17:07 +00:00
|
|
|
// py::register_local_exception<LocalSimpleException>(m, "LocalSimpleException")
|
2021-07-21 12:22:18 +00:00
|
|
|
|
|
|
|
py::register_local_exception_translator([](std::exception_ptr p) {
|
2022-02-10 20:17:07 +00:00
|
|
|
try {
|
|
|
|
if (p) {
|
|
|
|
std::rethrow_exception(p);
|
|
|
|
}
|
|
|
|
} catch (const MyException6 &e) {
|
|
|
|
PyErr_SetString(PyExc_RuntimeError, e.what());
|
|
|
|
}
|
2021-07-21 12:22:18 +00:00
|
|
|
});
|
|
|
|
|
2017-07-23 16:26:17 +00:00
|
|
|
m.def("throws1", []() { throw MyException("this error should go to a custom type"); });
|
2022-02-10 20:17:07 +00:00
|
|
|
m.def("throws2",
|
|
|
|
[]() { throw MyException2("this error should go to a standard Python exception"); });
|
2017-07-23 16:26:17 +00:00
|
|
|
m.def("throws3", []() { throw MyException3("this error cannot be translated"); });
|
|
|
|
m.def("throws4", []() { throw MyException4("this error is rethrown"); });
|
2022-02-10 20:17:07 +00:00
|
|
|
m.def("throws5",
|
|
|
|
[]() { throw MyException5("this is a helper-defined translated exception"); });
|
2017-07-23 16:26:17 +00:00
|
|
|
m.def("throws5_1", []() { throw MyException5_1("MyException5 subclass"); });
|
2021-07-21 12:22:18 +00:00
|
|
|
m.def("throws6", []() { throw MyException6("MyException6 only handled in this module"); });
|
2022-02-10 20:17:07 +00:00
|
|
|
m.def("throws_logic_error", []() {
|
|
|
|
throw std::logic_error("this error should fall through to the standard handler");
|
|
|
|
});
|
2021-07-21 12:22:18 +00:00
|
|
|
m.def("throws_overflow_error", []() { throw std::overflow_error(""); });
|
|
|
|
m.def("throws_local_error", []() { throw LocalException("never caught"); });
|
|
|
|
m.def("throws_local_simple_error", []() { throw LocalSimpleException("this mod"); });
|
2017-07-23 16:26:17 +00:00
|
|
|
m.def("exception_matches", []() {
|
|
|
|
py::dict foo;
|
2019-05-12 21:35:49 +00:00
|
|
|
try {
|
|
|
|
// Assign to a py::object to force read access of nonexistent dict entry
|
|
|
|
py::object o = foo["bar"];
|
2022-02-10 20:17:07 +00:00
|
|
|
} catch (py::error_already_set &ex) {
|
2022-02-08 00:23:20 +00:00
|
|
|
if (!ex.matches(PyExc_KeyError)) {
|
|
|
|
throw;
|
|
|
|
}
|
2019-05-12 21:35:49 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
});
|
|
|
|
m.def("exception_matches_base", []() {
|
|
|
|
py::dict foo;
|
|
|
|
try {
|
|
|
|
// Assign to a py::object to force read access of nonexistent dict entry
|
|
|
|
py::object o = foo["bar"];
|
2022-02-10 20:17:07 +00:00
|
|
|
} catch (py::error_already_set &ex) {
|
2022-02-08 00:23:20 +00:00
|
|
|
if (!ex.matches(PyExc_Exception)) {
|
|
|
|
throw;
|
|
|
|
}
|
2019-05-12 21:35:49 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
});
|
|
|
|
m.def("modulenotfound_exception_matches_base", []() {
|
|
|
|
try {
|
|
|
|
// On Python >= 3.6, this raises a ModuleNotFoundError, a subclass of ImportError
|
2020-10-03 17:38:03 +00:00
|
|
|
py::module_::import("nonexistent");
|
2022-02-10 20:17:07 +00:00
|
|
|
} catch (py::error_already_set &ex) {
|
2022-02-08 00:23:20 +00:00
|
|
|
if (!ex.matches(PyExc_ImportError)) {
|
|
|
|
throw;
|
|
|
|
}
|
2019-05-12 21:35:49 +00:00
|
|
|
return true;
|
2017-07-23 16:26:17 +00:00
|
|
|
}
|
2019-05-12 21:35:49 +00:00
|
|
|
return false;
|
2017-07-23 16:26:17 +00:00
|
|
|
});
|
2016-06-17 21:35:59 +00:00
|
|
|
|
2016-09-07 20:10:16 +00:00
|
|
|
m.def("throw_already_set", [](bool err) {
|
2022-02-08 00:23:20 +00:00
|
|
|
if (err) {
|
2016-09-07 20:10:16 +00:00
|
|
|
PyErr_SetString(PyExc_ValueError, "foo");
|
2022-02-08 00:23:20 +00:00
|
|
|
}
|
2016-09-07 20:10:16 +00:00
|
|
|
try {
|
|
|
|
throw py::error_already_set();
|
2022-02-10 20:17:07 +00:00
|
|
|
} catch (const std::runtime_error &e) {
|
|
|
|
if ((err && e.what() != std::string("ValueError: foo"))
|
|
|
|
|| (!err && e.what() != std::string("Unknown internal error occurred"))) {
|
2016-09-07 20:10:16 +00:00
|
|
|
PyErr_Clear();
|
|
|
|
throw std::runtime_error("error message mismatch");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
PyErr_Clear();
|
2022-02-08 00:23:20 +00:00
|
|
|
if (err) {
|
2016-09-07 20:10:16 +00:00
|
|
|
PyErr_SetString(PyExc_ValueError, "foo");
|
2022-02-08 00:23:20 +00:00
|
|
|
}
|
2016-09-07 20:10:16 +00:00
|
|
|
throw py::error_already_set();
|
|
|
|
});
|
2016-09-10 09:58:02 +00:00
|
|
|
|
2021-07-12 20:10:28 +00:00
|
|
|
m.def("python_call_in_destructor", [](const py::dict &d) {
|
|
|
|
bool retval = false;
|
2016-09-10 09:58:02 +00:00
|
|
|
try {
|
|
|
|
PythonCallInDestructor set_dict_in_destructor(d);
|
|
|
|
PyErr_SetString(PyExc_ValueError, "foo");
|
|
|
|
throw py::error_already_set();
|
2022-02-10 20:17:07 +00:00
|
|
|
} catch (const py::error_already_set &) {
|
2021-07-12 20:10:28 +00:00
|
|
|
retval = true;
|
2016-09-10 09:58:02 +00:00
|
|
|
}
|
2021-07-12 20:10:28 +00:00
|
|
|
return retval;
|
2016-09-10 09:58:02 +00:00
|
|
|
});
|
Simplify error_already_set
`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.
2017-07-21 03:14:33 +00:00
|
|
|
|
2021-06-22 16:11:54 +00:00
|
|
|
m.def("python_alreadyset_in_destructor", [](const py::str &s) {
|
2020-08-08 10:07:14 +00:00
|
|
|
PythonAlreadySetInDestructor alreadyset_in_destructor(s);
|
|
|
|
return true;
|
|
|
|
});
|
|
|
|
|
Simplify error_already_set
`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.
2017-07-21 03:14:33 +00:00
|
|
|
// test_nested_throws
|
2021-06-22 16:11:54 +00:00
|
|
|
m.def("try_catch",
|
|
|
|
[m](const py::object &exc_type, const py::function &f, const py::args &args) {
|
|
|
|
try {
|
|
|
|
f(*args);
|
|
|
|
} catch (py::error_already_set &ex) {
|
2022-02-08 00:23:20 +00:00
|
|
|
if (ex.matches(exc_type)) {
|
2021-06-22 16:11:54 +00:00
|
|
|
py::print(ex.what());
|
2022-02-08 00:23:20 +00:00
|
|
|
} else {
|
2021-06-22 16:11:54 +00:00
|
|
|
throw;
|
2022-02-08 00:23:20 +00:00
|
|
|
}
|
2021-06-22 16:11:54 +00:00
|
|
|
}
|
|
|
|
});
|
Simplify error_already_set
`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.
2017-07-21 03:14:33 +00:00
|
|
|
|
2020-08-18 11:14:34 +00:00
|
|
|
// Test repr that cannot be displayed
|
2022-02-10 20:17:07 +00:00
|
|
|
m.def("simple_bool_passthrough", [](bool x) { return x; });
|
2020-08-18 11:14:34 +00:00
|
|
|
|
2021-05-27 15:00:18 +00:00
|
|
|
m.def("throw_should_be_translated_to_key_error", []() { throw shared_exception(); });
|
2021-08-24 00:30:01 +00:00
|
|
|
|
|
|
|
#if PY_VERSION_HEX >= 0x03030000
|
|
|
|
|
|
|
|
m.def("raise_from", []() {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "inner");
|
|
|
|
py::raise_from(PyExc_ValueError, "outer");
|
|
|
|
throw py::error_already_set();
|
|
|
|
});
|
|
|
|
|
|
|
|
m.def("raise_from_already_set", []() {
|
|
|
|
try {
|
|
|
|
PyErr_SetString(PyExc_ValueError, "inner");
|
|
|
|
throw py::error_already_set();
|
2022-02-10 20:17:07 +00:00
|
|
|
} catch (py::error_already_set &e) {
|
2021-08-24 00:30:01 +00:00
|
|
|
py::raise_from(e, PyExc_ValueError, "outer");
|
|
|
|
throw py::error_already_set();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
2022-01-14 19:22:47 +00:00
|
|
|
m.def("throw_nested_exception", []() {
|
|
|
|
try {
|
|
|
|
throw std::runtime_error("Inner Exception");
|
|
|
|
} catch (const std::runtime_error &) {
|
|
|
|
std::throw_with_nested(std::runtime_error("Outer Exception"));
|
|
|
|
}
|
|
|
|
});
|
2021-08-24 00:30:01 +00:00
|
|
|
#endif
|
2017-07-23 16:26:17 +00:00
|
|
|
}
|