mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
#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.
This commit is contained in:
parent
96efdd422c
commit
b522828d2a
2 changed files with 22 additions and 1 deletions
|
@ -1701,9 +1701,12 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
|
||||||
return args
|
return args
|
||||||
|
|
||||||
def parse_known_args(self, args=None, namespace=None):
|
def parse_known_args(self, args=None, namespace=None):
|
||||||
# args default to the system args
|
|
||||||
if args is None:
|
if args is None:
|
||||||
|
# args default to the system args
|
||||||
args = _sys.argv[1:]
|
args = _sys.argv[1:]
|
||||||
|
else:
|
||||||
|
# make sure that args are mutable
|
||||||
|
args = list(args)
|
||||||
|
|
||||||
# default Namespace built from parser defaults
|
# default Namespace built from parser defaults
|
||||||
if namespace is None:
|
if namespace is None:
|
||||||
|
|
|
@ -4522,6 +4522,24 @@ class TestTypeFunctionCallWithNonStringDefault(TestCase):
|
||||||
|
|
||||||
class TestParseKnownArgs(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):
|
def test_optionals(self):
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
parser.add_argument('--foo')
|
parser.add_argument('--foo')
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue