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

Use PyConfig_InitPythonConfig instead of PyConfig_InitIsolatedConfig (#4473)

Browse Source 
* Use PyConfig_InitPythonConfig instead of PyConfig_InitIsolatedConfig

* add unit test for default python configuration

---------

Co-authored-by: Daniel Jacobs <daniel.jacobs@is4s.com>
This commit is contained in:
Daniel Jacobs 2023-02-01 02:42:05 -05:00 committed by GitHub
parent c71e3af73f
commit 44e9368222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/pybind11/embed.h
View File

@ -198,9 +198,10 @@ inline void initialize_interpreter(bool init_signal_handlers = true,
init_signal_handlers, argc, argv, add_program_dir_to_path); init_signal_handlers, argc, argv, add_program_dir_to_path);
#else #else
PyConfig config; PyConfig config;
PyConfig_InitIsolatedConfig(&config); PyConfig_InitPythonConfig(&config);
config.isolated = 0; // See PR #4473 for background
config.use_environment = 1; config.parse_argv = 0;
config.install_signal_handlers = init_signal_handlers ? 1 : 0; config.install_signal_handlers = init_signal_handlers ? 1 : 0;
initialize_interpreter(&config, argc, argv, add_program_dir_to_path); initialize_interpreter(&config, argc, argv, add_program_dir_to_path);
#endif #endif

22
tests/test_embed/test_interpreter.cpp
View File

@ -184,7 +184,7 @@ TEST_CASE("Custom PyConfig") {
py::initialize_interpreter(); py::initialize_interpreter();
} }
TEST_CASE("Custom PyConfig with argv") { TEST_CASE("scoped_interpreter with PyConfig_InitIsolatedConfig and argv") {
py::finalize_interpreter(); py::finalize_interpreter();
{ {
PyConfig config; PyConfig config;
@ -199,6 +199,26 @@ TEST_CASE("Custom PyConfig with argv") {
} }
py::initialize_interpreter(); py::initialize_interpreter();
} }
TEST_CASE("scoped_interpreter with PyConfig_InitPythonConfig and argv") {
py::finalize_interpreter();
{
PyConfig config;
PyConfig_InitPythonConfig(&config);
// `initialize_interpreter() overrides the default value for config.parse_argv (`1`) by
// changing it to `0`. This test exercises `scoped_interpreter` with the default config.
char *argv[] = {strdup("a.out"), strdup("arg1")};
py::scoped_interpreter argv_scope(&config, 2, argv);
std::free(argv[0]);
std::free(argv[1]);
auto module = py::module::import("test_interpreter");
auto py_widget = module.attr("DerivedWidget")("The question");
const auto &cpp_widget = py_widget.cast<const Widget &>();
REQUIRE(cpp_widget.argv0() == "arg1");
}
py::initialize_interpreter();
}
#endif #endif
TEST_CASE("Add program dir to path pre-PyConfig") { TEST_CASE("Add program dir to path pre-PyConfig") {