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

gh-118835: pyrepl: Fix prompt length computation for custom prompts containing ANSI escape codes #119942

Merged
merged 5 commits into from
Jun 3, 2024

Conversation

danielhollas
Copy link
Contributor

@danielhollas danielhollas commented Jun 2, 2024

The prompt length computation in Reader.process_prompt was broken since it used the wlen function from utils, but the wlen function already excluded the ANSI codes, which broke the existing logic.

The logic in that function could probably use some refactoring, but I wasn't confident in doing it due to its complexity. So I simply patched the wlen function locally. Happy to consider different approach.

Closes #118835.

@AlexWaygood AlexWaygood added needs backport to 3.13 bugs and security fixes topic-repl Related to the interactive shell labels Jun 2, 2024
@pablogsal
Copy link
Member

Thanks a lot for catching this and for the PR @danielhollas !

@pablogsal pablogsal merged commit 2e0aa73 into python:main Jun 3, 2024
45 checks passed
@miss-islington-app
Copy link

Thanks @danielhollas for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 3, 2024
…mpts containing ANSI escape codes (pythonGH-119942)

(cherry picked from commit 2e0aa73)

Co-authored-by: Daniel Hollas <daniel.hollas@bristol.ac.uk>
@bedevere-app
Copy link

bedevere-app bot commented Jun 3, 2024

GH-119990 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jun 3, 2024
@danielhollas danielhollas deleted the fix-prompt-len branch June 3, 2024 17:09
pablogsal pushed a commit that referenced this pull request Jun 3, 2024
…ompts containing ANSI escape codes (GH-119942) (#119990)

gh-118835: pyrepl: Fix prompt length computation for custom prompts containing ANSI escape codes (GH-119942)
(cherry picked from commit 2e0aa73)

Co-authored-by: Daniel Hollas <daniel.hollas@bristol.ac.uk>
mliezun pushed a commit to mliezun/cpython that referenced this pull request Jun 3, 2024
barneygale pushed a commit to barneygale/cpython that referenced this pull request Jun 5, 2024
noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic-repl Related to the interactive shell
Projects
None yet
3 participants