Skip to content

gh-139736: Fix argparse indentation overshoot #139738

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.

Sign up for GitHub

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
Merged
merged 2 commits into from
Oct 8, 2025
Merged

gh-139736: Fix argparse indentation overshoot #139738

merged 2 commits into from
Oct 8, 2025
+9 −7

Conversation

9001
Copy link
Contributor

@9001 9001 commented Oct 7, 2025 •
edited by bedevere-app bot
Loading

When calculating the --help indentation, strip colors before counting the action length.

@python-cla-bot
Copy link

python-cla-bot bot commented Oct 7, 2025 •
edited
Loading

All commit authors signed the Contributor License Agreement.

CLA signed

@bedevere-app
Copy link

bedevere-app bot commented Oct 7, 2025

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@bedevere-app bedevere-app bot mentioned this pull request Oct 7, 2025
Closed
@9001
Copy link
Contributor Author

9001 commented Oct 7, 2025

The argparse tests failed because the previous indentation amount is expected; should I go over the tests and adjust them accordingly?

@9001
pythongh-139736: Fix argparse indentation overshoot
f63fed7 
When calculating the --help indentation,
strip colors before counting the action length
@9001 9001 force-pushed the argparse-indent-fix branch from 2ac39cb to f63fed7 Compare October 8, 2025 00:07
@savannahostrowski
Copy link
Member

@9001 Thanks for catching this. I was able to reproduce this, and it appears that those tests were introduced in #133941, following the change in spacing with #130645. So yeah, I think we can update the tests to reflect the correct spacing.

@hugovk hugovk added the needs backport to 3.14 bugs and security fixes label Oct 8, 2025
@9001
Copy link
Contributor Author

9001 commented Oct 8, 2025

Alright -- I believe the remaining test failure is unrelated. Please let me know if there is anything more to be done at this point :)

@hugovk
Copy link
Member

hugovk commented Oct 8, 2025

I restarted the failure and it passed 👍

savannahostrowski
savannahostrowski approved these changes Oct 8, 2025
View reviewed changes
Copy link
Member

@savannahostrowski savannahostrowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks so much!

@savannahostrowski savannahostrowski enabled auto-merge (squash) October 8, 2025 15:09
@savannahostrowski savannahostrowski merged commit 72e370c into python:main Oct 8, 2025
45 checks passed
@miss-islington-app
Copy link

Thanks @9001 for the PR, and @savannahostrowski for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 8, 2025
@9001 @savannahostrowski @miss-islington
pythongh-139736: Fix argparse indentation overshoot (pythonGH-139738)
a4e04b7 
(cherry picked from commit 72e370c)

Co-authored-by: ed <s@ocv.me>
Co-authored-by: Savannah Ostrowski <savannahostrowski@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Oct 8, 2025

GH-139793 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Oct 8, 2025
savannahostrowski added a commit that referenced this pull request Oct 8, 2025
@miss-islington @9001 @savannahostrowski
[3.14] gh-139736: Fix argparse indentation overshoot (GH-139738) (#13…
14c923c 
…9793)

gh-139736: Fix argparse indentation overshoot (GH-139738)
(cherry picked from commit 72e370c)

Co-authored-by: ed <s@ocv.me>
Co-authored-by: Savannah Ostrowski <savannahostrowski@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@savannahostrowski savannahostrowski savannahostrowski approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@9001 @savannahostrowski @hugovk