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.

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

Jump to bottom

[3.8] bpo-38234: Backport path configuration changes from master #16423

Merged
merged 9 commits into from Sep 26, 2019
Merged

[3.8] bpo-38234: Backport path configuration changes from master #16423

merged 9 commits into from Sep 26, 2019

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Sep 26, 2019 •
edited by bedevere-bot

@vstinner
bpo-38234: Py_SetPath() uses the program full path (GH-16357)
7f4499b 
Py_SetPath() now sets sys.executable to the program full path
(Py_GetProgramFullPath()), rather than to the program name
(Py_GetProgramName()).

Fix also memory leaks in pathconfig_set_from_config().

(cherry picked from commit 1ce152a)
@vstinner
bpo-38234: Add tests for Python init path config (GH-16358)
f788933 
(cherry picked from commit bb6bf7d)
@vstinner
bpo-38234: test_embed: test pyvenv.cfg and pybuilddir.txt (GH-16366)
6651b6b 
Add test_init_pybuilddir() and test_init_pyvenv_cfg() to test_embed
to test pyvenv.cfg and pybuilddir.txt configuration files.

Fix sysconfig._generate_posix_vars(): pybuilddir.txt uses UTF-8
encoding, not ASCII.

(cherry picked from commit 52ad33a)
@vstinner
bpo-38234: Cleanup getpath.c (GH-16367)
6070aca 
* search_for_prefix() directly calls reduce() if found is greater
  than 0.
* Add calculate_pybuilddir() subfunction.
* search_for_prefix(): add path string buffer for readability.
* Fix some error handling code paths: release resources on error.
* calculate_read_pyenv(): rename tmpbuffer to filename.
* test.pythoninfo now also logs windows.dll_path

(cherry picked from commit 221fd84)
@vstinner
bpo-38234: Fix test_embed pathconfig tests (GH-16390)
654703c 
bpo-38234: On macOS and FreeBSD, the temporary directory can be
symbolic link. For example, /tmp can be a symbolic link to /var/tmp.
Call realpath() to resolve all symbolic links.

(cherry picked from commit 00508a7)
@vstinner
bpo-38234: Add test_init_setpath_config() to test_embed (GH-16402)
1b96c64 
* Add test_embed.test_init_setpath_config(): test Py_SetPath()
  with PyConfig.
* test_init_setpath() and test_init_setpythonhome() no longer call
  Py_SetProgramName(), but use the default program name.
* _PyPathConfig: isolated, site_import  and base_executable
  fields are now only available on Windows.
* If executable is set explicitly in the configuration, ignore
  calculated base_executable: _PyConfig_InitPathConfig() copies
  executable to base_executable.
* Complete path config documentation.

(cherry picked from commit 8bf39b6)
@vstinner
bpo-38234: Complete init config documentation (GH-16404)
00ee3ba 
(cherry picked from commit 88feaec)
@vstinner
bpo-38234: Fix test_embed.test_init_setpath_config() on FreeBSD (GH-1…
c2c5586 
…6406)

Explicitly preinitializes with a Python preconfiguration to avoid
Py_SetPath() implicit preinitialization with a compat
preconfiguration.

Fix also test_init_setpath() and test_init_setpythonhome() on macOS:
use self.test_exe as the executable (and base_executable), rather
than shutil.which('python3').

(cherry picked from commit 49d99f0)
@vstinner
bpo-38234: Py_Initialize() sets global path configuration (GH-16421)
d4d4a54 
* Py_InitializeFromConfig() now writes PyConfig path configuration to
  the global path configuration (_Py_path_config).
* Add test_embed.test_get_pathconfig().
* Fix typo in _PyWideStringList_Join().

(cherry picked from commit 12f2f17)
@vstinner vstinner requested a review from a team as a code owner September 26, 2019 13:55
@vstinner vstinner changed the title [3.8] Backport path configuration changes from master [3.8] bpo-38234: Backport path configuration changes from master Sep 26, 2019
@vstinner vstinner merged commit 96c8475 into python:3.8 Sep 26, 2019
@vstinner vstinner deleted the pathconfig38 branch September 26, 2019 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@vstinner @the-knights-who-say-ni @bedevere-bot