summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-09-08 16:14:25 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-09-08 16:14:25 (GMT)
commit63755f3bd94c7e193a44324d3248b2478cbf47fc (patch)
tree372087e0ce49819a85e04f2fc58df20f36733225
parent37a0170fa3e5023952040479675fd2002ffe3592 (diff)
parentb522828d2a6bdc4438441eda837a696851ba4263 (diff)
downloadcpython-63755f3bd94c7e193a44324d3248b2478cbf47fc.zip
cpython-63755f3bd94c7e193a44324d3248b2478cbf47fc.tar.gz
cpython-63755f3bd94c7e193a44324d3248b2478cbf47fc.tar.bz2
merge #15847: allow args to be a tuple in parse_args
This fixes a regression introduced by the fix for issue #13922. Although args is not documented as being allowed to be a tuple, previously this worked and so naturally there are programs in the field that depend on it. Patch by Zbyszek Jędrzejewski-Szmek.
-rw-r--r--Lib/argparse.py5
-rw-r--r--Lib/test/test_argparse.py18
2 files changed, 22 insertions, 1 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py
index adecb88..d5976e9 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1709,9 +1709,12 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
return args
def parse_known_args(self, args=None, namespace=None):
- # args default to the system args
if args is None:
+ # args default to the system args
args = _sys.argv[1:]
+ else:
+ # make sure that args are mutable
+ args = list(args)
# default Namespace built from parser defaults
if namespace is None:
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 72060da..caf99af 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4613,6 +4613,24 @@ class TestTypeFunctionCallWithNonStringDefault(TestCase):
class TestParseKnownArgs(TestCase):
+ def test_arguments_tuple(self):
+ parser = argparse.ArgumentParser()
+ parser.parse_args(())
+
+ def test_arguments_list(self):
+ parser = argparse.ArgumentParser()
+ parser.parse_args([])
+
+ def test_arguments_tuple_positional(self):
+ parser = argparse.ArgumentParser()
+ parser.add_argument('x')
+ parser.parse_args(('x',))
+
+ def test_arguments_list_positional(self):
+ parser = argparse.ArgumentParser()
+ parser.add_argument('x')
+ parser.parse_args(['x'])
+
def test_optionals(self):
parser = argparse.ArgumentParser()
parser.add_argument('--foo')