Commit 82277ff6 authored by R David Murray's avatar R David Murray

#12353: argparse now correctly handles null argument values.

Patch by Torsten Landschoff.
parent e2e40aff
...@@ -1976,7 +1976,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): ...@@ -1976,7 +1976,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
for arg_string in arg_strings: for arg_string in arg_strings:
# for regular arguments, just add them back into the list # for regular arguments, just add them back into the list
if arg_string[0] not in self.fromfile_prefix_chars: if not arg_string or arg_string[0] not in self.fromfile_prefix_chars:
new_arg_strings.append(arg_string) new_arg_strings.append(arg_string)
# replace arguments referencing files with the file content # replace arguments referencing files with the file content
......
...@@ -1371,6 +1371,7 @@ class TestArgumentsFromFile(TempDirMixin, ParserTestCase): ...@@ -1371,6 +1371,7 @@ class TestArgumentsFromFile(TempDirMixin, ParserTestCase):
('X @hello', NS(a=None, x='X', y=['hello world!'])), ('X @hello', NS(a=None, x='X', y=['hello world!'])),
('-a B @recursive Y Z', NS(a='A', x='hello world!', y=['Y', 'Z'])), ('-a B @recursive Y Z', NS(a='A', x='hello world!', y=['Y', 'Z'])),
('X @recursive Z -a B', NS(a='B', x='X', y=['hello world!', 'Z'])), ('X @recursive Z -a B', NS(a='B', x='X', y=['hello world!', 'Z'])),
(["-a", "", "X", "Y"], NS(a='', x='X', y=['Y'])),
] ]
......
...@@ -98,6 +98,8 @@ Core and Builtins ...@@ -98,6 +98,8 @@ Core and Builtins
Library Library
------- -------
- Issue #12353: argparse now correctly handles null argument values.
- Issues #10017 and #14998: Fix TypeError using pprint on dictionaries with - Issues #10017 and #14998: Fix TypeError using pprint on dictionaries with
user-defined types as keys or other unorderable keys. user-defined types as keys or other unorderable keys.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment