Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-21 20:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing default globals in eval/exec when embedding

Browse Source 
Fixes #887.
This commit is contained in:
Dean Moldovan 2017-06-06 17:05:19 +02:00
parent 91bbe2f2e5
commit 1d3c4bc54d
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/pybind11/eval.h
View File

@ -27,12 +27,7 @@ enum eval_mode {
};
template <eval_mode mode = eval_expr>
object eval(str expr, object global = object(), object local = object()) {
if (!global) {
global = reinterpret_borrow<object>(PyEval_GetGlobals());
if (!global)
global = dict();
}
object eval(str expr, object global = globals(), object local = object()) {
if (!local)
local = global;
@ -55,29 +50,24 @@ object eval(str expr, object global = object(), object local = object()) {
}
template <eval_mode mode = eval_expr, size_t N>
object eval(const char (&s)[N], object global = object(), object local = object()) {
object eval(const char (&s)[N], object global = globals(), object local = object()) {
/* Support raw string literals by removing common leading whitespace */
auto expr = (s[0] == '\n') ? str(module::import("textwrap").attr("dedent")(s))
: str(s);
return eval<mode>(expr, global, local);
}
inline void exec(str expr, object global = object(), object local = object()) {
inline void exec(str expr, object global = globals(), object local = object()) {
eval<eval_statements>(expr, global, local);
}
template <size_t N>
void exec(const char (&s)[N], object global = object(), object local = object()) {
void exec(const char (&s)[N], object global = globals(), object local = object()) {
eval<eval_statements>(s, global, local);
}
template <eval_mode mode = eval_statements>
object eval_file(str fname, object global = object(), object local = object()) {
if (!global) {
global = reinterpret_borrow<object>(PyEval_GetGlobals());
if (!global)
global = dict();
}
object eval_file(str fname, object global = globals(), object local = object()) {
if (!local)
local = global;

8
include/pybind11/pybind11.h
View File

@ -799,8 +799,12 @@ public:
};
/// \ingroup python_builtins
/// Return a dictionary representing the global symbol table, i.e. ``__main__.__dict__``.
inline dict globals() { return module::import("__main__").attr("__dict__").cast<dict>(); }
/// Return a dictionary representing the global variables in the current execution frame,
/// or ``__main__.__dict__`` if there is no frame (usually when the interpreter is embedded).
inline dict globals() {
PyObject *p = PyEval_GetGlobals();
return reinterpret_borrow<dict>(p ? p : module::import("__main__").attr("__dict__").ptr());
}
NAMESPACE_BEGIN(detail)
/// Generic support for creating new Python heap types

7
tests/test_embed/test_interpreter.cpp
View File

@ -153,3 +153,10 @@ TEST_CASE("Subinterpreter") {
REQUIRE(py::hasattr(py::module::import("__main__"), "main_tag"));
REQUIRE(py::hasattr(py::module::import("widget_module"), "extension_module_tag"));
}
TEST_CASE("Execution frame") {
// When the interpreter is embedded, there is no execution frame, but `py::exec`
// should still function by using reasonable globals: `__main__.__dict__`.
py::exec("var = dict(number=42)");
REQUIRE(py::globals()["var"]["number"].cast<int>() == 42);
}