-
-
Notifications
You must be signed in to change notification settings - Fork 32.4k
gh-46927: Prevent readline from overriding environment #133585
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
Open
mbriand
wants to merge
7
commits into
python:main
Choose a base branch
from
mbriand:fix-issue-46927
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
bc76d98
gh-46927: Prevent readline from overriding environment
mbriand c2e4e29
Disable rl_change_environment on apple
mbriand d73c47a
Merge branch 'main' into fix-issue-46927
ZeroIntensity 23999d9
Fix NEWS
mbriand 3159919
Add test
mbriand f14a8d6
Use os.reload_environ() in test
mbriand a91fe5d
test: remove subprocess dependency
mbriand File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
2 changes: 2 additions & 0 deletions
2
Misc/NEWS.d/next/Core_and_Builtins/2025-05-07-18-31-31.gh-issue-46927.sF02gj.rst
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
Prevent :mod:`readline` from overriding the ``COLUMNS`` and ``LINES`` | ||
environment variables, as values are not updated on terminal resize. |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1323,6 +1323,13 @@ setup_readline(readlinestate *mod_state) | |
/* The name must be defined before initialization */ | ||
rl_readline_name = "python"; | ||
|
||
#if !defined(__APPLE__) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm a bit surprised I had to rely on the |
||
/* Prevent readline from changing environment variables such as LINES and | ||
* COLUMNS. | ||
*/ | ||
rl_change_environment = 0; | ||
#endif | ||
|
||
/* the libedit readline emulation resets key bindings etc | ||
* when calling rl_initialize. So call it upfront | ||
*/ | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you forget to add the use of
subprocess
here? This test always passes.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Err sorry, I reworked the test and forgot to remove the subprocess requirement.
But I do confirm this test fails if I revert the initial commit of the PR.