cpython: c4ad8a6eb0df (original) (raw)
Mercurial > cpython
changeset 78230:c4ad8a6eb0df
Merge #12353: argparse now correctly handles null argument values. Patch by Torsten Landschoff. [#12353]
| R David Murray rdmurray@bitdance.com | |
|---|---|
| date | Sat, 21 Jul 2012 22:28:08 -0400 |
| parents | 3d1ea33611c1(current diff)ac53876d1cc8(diff) |
| children | a636f365d815 |
| files | Lib/argparse.py Lib/test/test_argparse.py Misc/NEWS |
| diffstat | 3 files changed, 4 insertions(+), 1 deletions(-)[+] [-] Lib/argparse.py 2 Lib/test/test_argparse.py 1 Misc/NEWS 2 |
line wrap: on
line diff
--- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1979,7 +1979,7 @@ class ArgumentParser(_AttributeHolder, _ 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:[](#l1.7)
if not arg_string or arg_string[0] not in self.fromfile_prefix_chars:[](#l1.8) new_arg_strings.append(arg_string)[](#l1.9)
# replace arguments referencing files with the file content
--- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -1372,6 +1372,7 @@ class TestArgumentsFromFile(TempDirMixin ('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/Misc/NEWS +++ b/Misc/NEWS @@ -52,6 +52,8 @@ Core and Builtins Library ------- +- Issue #12353: argparse now correctly handles null argument values. +