GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — argparse: use str() consistently and explicitly to print choices · python/cpython@48f6b8c

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Lib
- argparse.py
- test
  - test_argparse.py
Misc/NEWS.d/next/Library
- 2024-04-19-05-58-50.gh-issue-117766.J3xepp.rst

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎Lib/argparse.py‎`

Copy file name to clipboardExpand all lines: Lib/argparse.py

+4-6Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -584,8 +584,7 @@ def _metavar_formatter(self, action, default_metavar):`
`584`	`584`	`if action.metavar is not None:`
`585`	`585`	`result = action.metavar`
`586`	`586`	`elif action.choices is not None:`
`587`		`- choice_strs = [str(choice) for choice in action.choices]`
`588`		`- result = '{%s}' % ','.join(choice_strs)`
	`587`	`+ result = '{%s}' % ','.join(map(str, action.choices))`
`589`	`588`	`else:`
`590`	`589`	`result = default_metavar`
`591`	`590`
`@@ -633,8 +632,7 @@ def _expand_help(self, action):`
`633`	`632`	`if hasattr(params[name], '__name__'):`
`634`	`633`	`params[name] = params[name].__name__`
`635`	`634`	`if params.get('choices') is not None:`
`636`		`- choices_str = ', '.join([str(c) for c in params['choices']])`
`637`		`- params['choices'] = choices_str`
	`635`	`+ params['choices'] = ', '.join(map(str, params['choices']))`
`638`	`636`	`return self._get_help_string(action) % params`
`639`	`637`
`640`	`638`	`def _iter_indented_subactions(self, action):`
`@@ -743,7 +741,7 @@ def _get_action_name(argument):`
`743`	`741`	`elif argument.dest not in (None, SUPPRESS):`
`744`	`742`	`return argument.dest`
`745`	`743`	`elif argument.choices:`
`746`		`- return '{' + ','.join(argument.choices) + '}'`
	`744`	`+ return '{%s}' % ','.join(map(str, argument.choices))`
`747`	`745`	`else:`
`748`	`746`	`return None`
`749`	`747`
`@@ -2613,7 +2611,7 @@ def _check_value(self, action, value):`
`2613`	`2611`	`# converted value must be one of the choices (if specified)`
`2614`	`2612`	`if action.choices is not None and value not in action.choices:`
`2615`	`2613`	`args = {'value': value,`
`2616`		`- 'choices': ', '.join(map(repr, action.choices))}`
	`2614`	`+ 'choices': ', '.join(map(str, action.choices))}`
`2617`	`2615`	`msg = _('invalid choice: %(value)r (choose from %(choices)s)')`
`2618`	`2616`	`raise ArgumentError(action, msg % args)`
`2619`	`2617`

Collapse file

`‎Lib/test/test_argparse.py‎`

Copy file name to clipboardExpand all lines: Lib/test/test_argparse.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2361,7 +2361,7 @@ def test_wrong_argument_subparsers_no_destination_error(self):`
`2361`	`2361`	`parser.parse_args(('baz',))`
`2362`	`2362`	`self.assertRegex(`
`2363`	`2363`	`excinfo.exception.stderr,`
`2364`		`- r"error: argument {foo,bar}: invalid choice: 'baz' $choose from 'foo', 'bar'$\n$"`
	`2364`	`+ r"error: argument {foo,bar}: invalid choice: 'baz' $choose from foo, bar$\n$"`
`2365`	`2365`	`)`
`2366`	`2366`
`2367`	`2367`	`def test_optional_subparsers(self):`

Collapse file

`‎Misc/NEWS.d/next/Library/2024-04-19-05-58-50.gh-issue-117766.J3xepp.rst‎`

Copy file name to clipboard

+1Lines changed: 1 addition & 0 deletions

Display the source diff
Display the rich diff

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Always use :func:`str()` to print ``choices`` in :mod:`argparse`.

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.