Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

embed.h Python 3.11 config.use_environment=1 + PYTHONPATH test #4119

Merged
merged 10 commits into from
Aug 21, 2022
Merged

embed.h Python 3.11 config.use_environment=1 + PYTHONPATH test #4119

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
198c9c2
Add debug fprintf to test_interpreter.cpp
Aug 5, 2022
25ababa
Update `sys.path` from `PYTHONPATH` in Python >= 3.11 branch of `init…
Aug 5, 2022
a8e0534
Merge branch 'master' into py311_related
Aug 15, 2022
65aa526
Use `config.isolated = 0; config.use_environment = 1;`
Aug 18, 2022
379da55
Add `TEST_CASE("PYTHONPATH is used to update sys.path")`
Aug 19, 2022
eea4e26
Fix clang-tidy error.
Aug 20, 2022
5e08ab3
Use `_putenv_s()` under Windows.
Aug 20, 2022
bfbf4b3
Fix clang-tidy error: argument name ... in comment does not match par…
Aug 20, 2022
e4340b4
Remove slash from PYTHONPATH addition, to work around Windows slash-v…
Aug 20, 2022
086609c
Use `py::str(...)` instead of `.attr("__str__")` as suggested by @sky…
rwgk Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/pybind11/embed.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ inline void initialize_interpreter(bool init_signal_handlers = true,
#else
PyConfig config;
PyConfig_InitIsolatedConfig(&config);
config.isolated = 0;
config.use_environment = 1;
config.install_signal_handlers = init_signal_handlers ? 1 : 0;

PyStatus status = PyConfig_SetBytesArgv(&config, argc, const_cast<char *const *>(argv));
Expand Down
12 changes: 12 additions & 0 deletions tests/test_embed/test_interpreter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,18 @@ bool has_pybind11_internals_static() {

TEST_CASE("Restart the interpreter") {
// Verify pre-restart state.
fprintf(stdout,
"\nLOOOK PYTHONPATH %s\n",
py::module_::import("os")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be cleaner to just use the py::print API here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is/was just for debugging, I'll remove this before taking this PR out of draft mode, after adding a unit test for PYTHONPATH processing.

I think py::print could do indirections. For debugging I generally try to go straight down to the bare metal.

.attr("environ")
.attr("get")("PYTHONPATH")
.attr("__str__")()
.cast<std::string>()
.c_str());
fflush(stdout);
auto sys_path = py::module_::import("sys").attr("path").attr("__str__")().cast<std::string>();
fprintf(stdout, "\nLOOOK sys.path %s\n", sys_path.c_str());
fflush(stdout);
REQUIRE(py::module_::import("widget_module").attr("add")(1, 2).cast<int>() == 3);
REQUIRE(has_pybind11_internals_builtin());
REQUIRE(has_pybind11_internals_static());
Expand Down