[Python-checkins] cpython (merge 3.2 -> default): merge #15847: allow args to be a tuple in parse_args

r.david.murray python-checkins at python.org
Sat Sep 8 18:35:09 CEST 2012


http://hg.python.org/cpython/rev/76655483c5c8
changeset:   78880:76655483c5c8
parent:      78878:ca81b9a3a015
parent:      78879:5d8454fcc629
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 12:14:25 2012 -0400
summary:
  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.

files:
  Lib/argparse.py           |   5 ++++-
  Lib/test/test_argparse.py |  18 ++++++++++++++++++
  2 files changed, 22 insertions(+), 1 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1709,9 +1709,12 @@
         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
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4613,6 +4613,24 @@
 
 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')

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list