Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-11 02:52:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.14] gh-139736: Fix argparse indentation overshoot (GH-139738) (#139793)

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

Co-authored-by: ed <s@ocv.me>
Co-authored-by: Savannah Ostrowski <savannahostrowski@gmail.com>
This commit is contained in:
Miss Islington (bot) 2025-10-08 18:02:08 +02:00 • committed by GitHub
parent 4e3fc92c40
commit 14c923cc85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/argparse.py
View file

@ -281,7 +281,7 @@ def add_argument(self, action):
if action.help is not SUPPRESS: if action.help is not SUPPRESS:
# find all invocations # find all invocations
get_invocation = self._format_action_invocation get_invocation = lambda x: self._decolor(self._format_action_invocation(x))
invocation_lengths = [len(get_invocation(action)) + self._current_indent] invocation_lengths = [len(get_invocation(action)) + self._current_indent]
for subaction in self._iter_indented_subactions(action): for subaction in self._iter_indented_subactions(action):
invocation_lengths.append(len(get_invocation(subaction)) + self._current_indent) invocation_lengths.append(len(get_invocation(subaction)) + self._current_indent)

12
Lib/test/test_argparse.py
View file

@ -7311,11 +7311,11 @@ def custom_formatter(prog):
{heading}usage: {reset}{prog}PROG{reset} [{short}-h{reset}] [{short}+f {label}FOO{reset}] {pos}spam{reset} {heading}usage: {reset}{prog}PROG{reset} [{short}-h{reset}] [{short}+f {label}FOO{reset}] {pos}spam{reset}
{heading}positional arguments:{reset} {heading}positional arguments:{reset}
{pos_b}spam{reset} spam help {pos_b}spam{reset} spam help
{heading}options:{reset} {heading}options:{reset}
{short_b}-h{reset}, {long_b}--help{reset} show this help message and exit {short_b}-h{reset}, {long_b}--help{reset} show this help message and exit
{short_b}+f{reset}, {long_b}++foo{reset} {label_b}FOO{reset} foo help {short_b}+f{reset}, {long_b}++foo{reset} {label_b}FOO{reset} foo help
''')) '''))
def test_custom_formatter_class(self): def test_custom_formatter_class(self):
@ -7348,11 +7348,11 @@ def __init__(self, prog):
{heading}usage: {reset}{prog}PROG{reset} [{short}-h{reset}] [{short}+f {label}FOO{reset}] {pos}spam{reset} {heading}usage: {reset}{prog}PROG{reset} [{short}-h{reset}] [{short}+f {label}FOO{reset}] {pos}spam{reset}
{heading}positional arguments:{reset} {heading}positional arguments:{reset}
{pos_b}spam{reset} spam help {pos_b}spam{reset} spam help
{heading}options:{reset} {heading}options:{reset}
{short_b}-h{reset}, {long_b}--help{reset} show this help message and exit {short_b}-h{reset}, {long_b}--help{reset} show this help message and exit
{short_b}+f{reset}, {long_b}++foo{reset} {label_b}FOO{reset} foo help {short_b}+f{reset}, {long_b}++foo{reset} {label_b}FOO{reset} foo help
''')) '''))

2
Misc/NEWS.d/next/Library/2025-10-08-00-06-30.gh-issue-139736.baPeBd.rst Normal file
View file

@ -0,0 +1,2 @@
Fix excessive indentation in the default :mod:`argparse`
:class:`!HelpFormatter`. Patch by Alexander Edland.