mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-22 21:25:13 +00:00
135ba8deaf
This clears the Python error at the error_already_set throw site, thus allowing Python calls to be made in destructors which are triggered by the exception. This is preferable to the alternative, which would be guarding every Python API call with an error_scope. This effectively flips the behavior of error_already_set. Previously, it was assumed that the error stays in Python, so handling the exception in C++ would require explicitly calling PyErr_Clear(), but nothing was needed to propagate the error to Python. With this change, handling the error in C++ does not require a PyErr_Clear() call, but propagating the error to Python requires an explicit error_already_set::restore(). The change does not break old code which explicitly calls PyErr_Clear() for cleanup, which should be the majority of user code. The need for an explicit restore() call does break old code, but this should be mostly confined to the library and not user code.
80 lines
2.1 KiB
C++
80 lines
2.1 KiB
C++
/*
|
|
tests/test_eval.cpp -- Usage of eval() and eval_file()
|
|
|
|
Copyright (c) 2016 Klemens D. Morgenstern
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
BSD-style license that can be found in the LICENSE file.
|
|
*/
|
|
|
|
|
|
#include <pybind11/eval.h>
|
|
#include "pybind11_tests.h"
|
|
|
|
test_initializer eval([](py::module &m) {
|
|
auto global = py::dict(py::module::import("__main__").attr("__dict__"));
|
|
|
|
m.def("test_eval_statements", [global]() {
|
|
auto local = py::dict();
|
|
local["call_test"] = py::cpp_function([&]() -> int {
|
|
return 42;
|
|
});
|
|
|
|
auto result = py::eval<py::eval_statements>(
|
|
"print('Hello World!');\n"
|
|
"x = call_test();",
|
|
global, local
|
|
);
|
|
auto x = local["x"].cast<int>();
|
|
|
|
return result == py::none() && x == 42;
|
|
});
|
|
|
|
m.def("test_eval", [global]() {
|
|
auto local = py::dict();
|
|
local["x"] = py::int_(42);
|
|
auto x = py::eval("x", global, local);
|
|
return x.cast<int>() == 42;
|
|
});
|
|
|
|
m.def("test_eval_single_statement", []() {
|
|
auto local = py::dict();
|
|
local["call_test"] = py::cpp_function([&]() -> int {
|
|
return 42;
|
|
});
|
|
|
|
auto result = py::eval<py::eval_single_statement>("x = call_test()", py::dict(), local);
|
|
auto x = local["x"].cast<int>();
|
|
return result == py::none() && x == 42;
|
|
});
|
|
|
|
m.def("test_eval_file", [global](py::str filename) {
|
|
auto local = py::dict();
|
|
local["y"] = py::int_(43);
|
|
|
|
int val_out;
|
|
local["call_test2"] = py::cpp_function([&](int value) { val_out = value; });
|
|
|
|
auto result = py::eval_file(filename, global, local);
|
|
return val_out == 43 && result == py::none();
|
|
});
|
|
|
|
m.def("test_eval_failure", []() {
|
|
try {
|
|
py::eval("nonsense code ...");
|
|
} catch (py::error_already_set &) {
|
|
return true;
|
|
}
|
|
return false;
|
|
});
|
|
|
|
m.def("test_eval_file_failure", []() {
|
|
try {
|
|
py::eval_file("non-existing file");
|
|
} catch (std::exception &) {
|
|
return true;
|
|
}
|
|
return false;
|
|
});
|
|
});
|