Merge #12353: argparse now correctly handles null argument values.

bitdancer · bitdancer · commit d4703d1d85fc · 2012-07-21T22:28:08.000-04:00
Patch by Torsten Landschoff.
diff --git a/Lib/argparse.py b/Lib/argparse.py
@@ -1979,7 +1979,7 @@ def _read_args_from_files(self, arg_strings):
         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
@@ -1372,6 +1372,7 @@ def setUp(self):
         ('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
@@ -52,6 +52,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.
 

Original file line number	Diff line number	Diff line change
`@@ -1372,6 +1372,7 @@ def setUp(self):`
`1372`	`1372`	`('X @hello', NS(a=None, x='X', y=['hello world!'])),`
`1373`	`1373`	`('-a B @recursive Y Z', NS(a='A', x='hello world!', y=['Y', 'Z'])),`
`1374`	`1374`	`('X @recursive Z -a B', NS(a='B', x='X', y=['hello world!', 'Z'])),`
	`1375`	`+ (["-a", "", "X", "Y"], NS(a='', x='X', y=['Y'])),`
`1375`	`1376`	`]`
`1376`	`1377`
`1377`	`1378`