mirror of
https://github.com/python/cpython.git
synced 2025-12-23 09:19:18 +00:00
Merge 62ceb27c41 into f9704f1d84
This commit is contained in:
commit
8fdb5efe9a
3 changed files with 39 additions and 4 deletions
|
|
@ -688,11 +688,29 @@ class HelpFormatter(object):
|
|||
params[name] = value.__name__
|
||||
if params.get('choices') is not None:
|
||||
params['choices'] = ', '.join(map(str, params['choices']))
|
||||
# Before interpolating, wrap the values with color codes
|
||||
|
||||
t = self._theme
|
||||
for name, value in params.items():
|
||||
params[name] = f"{t.interpolated_value}{value}{t.reset}"
|
||||
return help_string % params
|
||||
|
||||
if not t.reset:
|
||||
return help_string % params
|
||||
|
||||
# Format first to preserve types for specifiers, like %x that require int.
|
||||
def colorize(match):
|
||||
spec, name = match.group(0, 1)
|
||||
if spec == '%%':
|
||||
return '%'
|
||||
if name in params:
|
||||
formatted = spec % {name: params[name]}
|
||||
return f'{t.interpolated_value}{formatted}{t.reset}'
|
||||
return spec
|
||||
|
||||
# Match %% or %(name)... format specifiers
|
||||
result = _re.sub(r'%%|%\((\w+)\)[^a-z]*[a-z]', colorize,
|
||||
help_string, flags=_re.IGNORECASE)
|
||||
|
||||
if '%' in result:
|
||||
raise ValueError(f"invalid format specifier in: {help_string!r}")
|
||||
return result
|
||||
|
||||
def _iter_indented_subactions(self, action):
|
||||
try:
|
||||
|
|
|
|||
|
|
@ -7663,6 +7663,22 @@ class TestColorized(TestCase):
|
|||
help_text = parser.format_help()
|
||||
self.assertIn(f'{prog_extra}grep "foo.*bar" | sort{reset}', help_text)
|
||||
|
||||
def test_help_with_format_specifiers(self):
|
||||
# GH-142950: format specifiers like %x should work with color=True
|
||||
parser = argparse.ArgumentParser(prog='PROG', color=True)
|
||||
parser.add_argument('--hex', type=int, default=255,
|
||||
help='hex: %(default)x')
|
||||
parser.add_argument('--str', default='test',
|
||||
help='str: %(default)s')
|
||||
|
||||
help_text = parser.format_help()
|
||||
|
||||
interp = self.theme.interpolated_value
|
||||
reset = self.theme.reset
|
||||
|
||||
self.assertIn(f'hex: {interp}ff{reset}', help_text)
|
||||
self.assertIn(f'str: {interp}test{reset}', help_text)
|
||||
|
||||
def test_print_help_uses_target_file_for_color_decision(self):
|
||||
parser = argparse.ArgumentParser(prog='PROG', color=True)
|
||||
parser.add_argument('--opt')
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Fix regression in :mod:`argparse` where format specifiers in help strings raised :exc:`ValueError`.
|
||||
Loading…
Add table
Add a link
Reference in a new issue