From b522828d2a6bdc4438441eda837a696851ba4263 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Sat, 8 Sep 2012 12:08:01 -0400 Subject: #15847: allow args to be a tuple in parse_args MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- Lib/argparse.py | 5 ++++- Lib/test/test_argparse.py | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Lib/argparse.py b/Lib/argparse.py index f77c0c2..52ed3ab 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1701,9 +1701,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 cc05160..a2f9a69 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -4522,6 +4522,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') -- cgit v0.12