From b94082a71b6b141cdcdde52a0f01b10f9334b5a8 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Sat, 21 Jul 2012 22:20:11 -0400 Subject: #12353: argparse now correctly handles null argument values. Patch by Torsten Landschoff. --- Lib/argparse.py | 2 +- Lib/test/test_argparse.py | 1 + Misc/NEWS | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/argparse.py b/Lib/argparse.py index cf0097b..25803b3 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1976,7 +1976,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): for arg_string in arg_strings: # 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) # replace arguments referencing files with the file content diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index 852991c..1a72a13 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -1371,6 +1371,7 @@ class TestArgumentsFromFile(TempDirMixin, ParserTestCase): ('X @hello', NS(a=None, x='X', y=['hello world!'])), ('-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'])), + (["-a", "", "X", "Y"], NS(a='', x='X', y=['Y'])), ] diff --git a/Misc/NEWS b/Misc/NEWS index 3d4d049..57f3650 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -98,6 +98,8 @@ Core and Builtins Library ------- +- Issue #12353: argparse now correctly handles null argument values. + - Issues #10017 and #14998: Fix TypeError using pprint on dictionaries with user-defined types as keys or other unorderable keys. -- cgit v0.12