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.

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

gh-101979: fix a bug that parentheses in metavar argument of add_argument() were dropped #102318

Merged
merged 8 commits into from
Mar 5, 2023
Merged

gh-101979: fix a bug that parentheses in metavar argument of add_argument() were dropped #102318

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4d68880
Delete a redundant cleanup
yeojin-dev Feb 28, 2023
70ef4fc
Add parenthesis only when there are more than two required actions
yeojin-dev Feb 28, 2023
da07d8c
Count only exposed actions
yeojin-dev Feb 28, 2023
4c6889c
Add testcase
yeojin-dev Feb 28, 2023
0dc91c0
Add NEWS.d
yeojin-dev Feb 28, 2023
7f82863
Fix typo
yeojin-dev Feb 28, 2023
74c14ce
Refactor code
yeojin-dev Mar 1, 2023
b05fb16
Update Misc/NEWS.d/next/Library/2023-02-28-09-52-25.gh-issue-101979.o…
yeojin-dev Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Lib/argparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,15 @@ def _format_actions_usage(self, actions, groups):
else:
end = start + len(group._group_actions)
yeojin-dev marked this conversation as resolved.
Show resolved Hide resolved
if actions[start:end] == group._group_actions:

suppressed_actions_count = 0
for action in group._group_actions:
group_actions.add(action)
if action.help is SUPPRESS:
suppressed_actions_count += 1

exposed_actions_count = len(group._group_actions) - suppressed_actions_count
yeojin-dev marked this conversation as resolved.
Show resolved Hide resolved

if not group.required:
if start in inserts:
inserts[start] += ' ['
Expand All @@ -416,7 +423,7 @@ def _format_actions_usage(self, actions, groups):
inserts[end] += ']'
else:
inserts[end] = ']'
else:
elif exposed_actions_count > 1:
if start in inserts:
inserts[start] += ' ('
else:
Expand Down Expand Up @@ -490,7 +497,6 @@ def _format_actions_usage(self, actions, groups):
text = _re.sub(r'(%s) ' % open, r'\1', text)
text = _re.sub(r' (%s)' % close, r'\1', text)
text = _re.sub(r'%s *%s' % (open, close), r'', text)
text = _re.sub(r'\(([^|]*)\)', r'\1', text)
text = text.strip()

# return the text
Expand Down
22 changes: 22 additions & 0 deletions Lib/test/test_argparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3764,6 +3764,28 @@ class TestHelpUsage(HelpTestCase):
version = ''


class TestHelpUsageWithParentheses(HelpTestCase):
Copy link
Member

Choose a reason for hiding this comment

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

I don't see any tests that actually add parentheses for a group with more than one action. Could you add one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's a good idea. But I think the testcase you want already exists using the code below. Please review it.

cpython/Lib/test/test_argparse.py

Line 2777 in 66aa78c

usage: PROG [-h] (--bar BAR | --baz [BAZ])

Copy link
Member

Choose a reason for hiding this comment

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

You're right, thanks! There are a lot of tests, I must have glanced over that one.

parser_signature = Sig(prog='PROG')
argument_signatures = [
Sig('positional', metavar='(example) positional'),
Sig('-p', '--optional', metavar='{1 (option A), 2 (option B)}'),
]

usage = '''\
usage: PROG [-h] [-p {1 (option A), 2 (option B)}] (example) positional
'''
help = usage + '''\

positional arguments:
(example) positional

options:
-h, --help show this help message and exit
-p {1 (option A), 2 (option B)}, --optional {1 (option A), 2 (option B)}
'''
version = ''


class TestHelpOnlyUserGroups(HelpTestCase):
"""Test basic usage messages"""

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2023-02-28-09-52-25.gh-issue-101979.or3hXV.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a bug that parentheses in metavar argument of :func:`add_argument()` were
yeojin-dev marked this conversation as resolved.
Show resolved Hide resolved
dropped. Patch by Yeojin Kim.