Repository navigation
bpo-29585: Fix sysconfig.get_config_var("PYTHONFRAMEWORK") - #2483
Merged
methane merged 2 commits intoJun 29, 2017
Merged
methane merged 2 commits into
methane merged 2 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
`PYTHONFRAMEWORK` is defined in `Makefile` and it shoulnd't be used in `pyconfig.h`. `sysconfig.py --generate-posix-vars` reads config vars from Makefile and `pyconfig.h`. Conflicting variables should be avoided. Especially, string config variables in Makefile are unquoted, but in `pyconfig.h` are keep quoted. So it should be private (starts with underscore).
Copy link
Copy Markdown
Member
Author
|
https://travis-ci.org/python/cpython/jobs/248237175 macOS test now passed. |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
|
Thanks for fixing maxOS :-) |
Sorry, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
After GH-136 merged, PYTHONFRAMEWORK config variable are in Makefile and pyconfig.h.
When reading string variable from Makefile, quote is removed.
But when reading them from pyconfig.h, quote is not removed. And config variables in
pyconfig.h override config variables in Makefile.
So sysconfig.get_config_var("PYTHONFRAMEWORK") was changed '' to '""' in
non framework build, and 'PYTHON' to '"PYTHON"' in framework build.
I thought about unquoting string config variables in pyconfig.h, but there is one
string variables already and it may cause unintentional backward incompatibility.
(sysconfig.get_config_var('PY_FORMAT_SIZE_T') is '"z"').
So this pull request just rename PYTHONFRAMEWORK to _PYTHONFRAMEWORK
in pyconfig.h. Variables which name starts with _ is not exported to sysconfig.