A follow up for issue #15906: change the test for calling the type conversion

on the action's default, reverting it back to previous behavior.  Conversion
is only done on string defaults.

Add a test for this and another test that ensures such type conversions are
only called once.

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 440d8faef63c334bc297dfbc3fef2932b01f77f0..30bae57896c316501940247fa76512756ea08932 100644 (file)
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1948,7 +1948,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
                     # twice (which may fail) if the argument was given, but
                     # only if it was defined already in the namespace
                     if (action.default is not None and
-                            isinstance(action, _StoreAction) and
+                            isinstance(action.default, basestring) and
                             hasattr(namespace, action.dest) and
                             action.default is getattr(namespace, action.dest)):
                         setattr(namespace, action.dest,

diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index c6119440f76b52e1818b53e7f9ee662d281d24bd..30fdf4a4f46077e7ae454d186fddf2f02ef4681e 100644 (file)
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4464,11 +4464,11 @@ class TestTypeFunctionCallOnlyOnce(TestCase):
         args = parser.parse_args('--foo spam!'.split())
         self.assertEqual(NS(foo='foo_converted'), args)
 
-# ================================================================
-# Check that the type function is called with a non-string default
-# ================================================================
+# ==================================================================
+# Check semantics regarding the default argument and type conversion
+# ==================================================================
 
-class TestTypeFunctionCallWithNonStringDefault(TestCase):
+class TestTypeFunctionCalledOnDefault(TestCase):
 
     def test_type_function_call_with_non_string_default(self):
         def spam(int_to_convert):
@@ -4478,8 +4478,31 @@ class TestTypeFunctionCallWithNonStringDefault(TestCase):
         parser = argparse.ArgumentParser()
         parser.add_argument('--foo', type=spam, default=0)
         args = parser.parse_args([])
+        # foo should *not* be converted because its default is not a string.
+        self.assertEqual(NS(foo=0), args)
+
+    def test_type_function_call_with_string_default(self):
+        def spam(int_to_convert):
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='0')
+        args = parser.parse_args([])
+        # foo is converted because its default is a string.
         self.assertEqual(NS(foo='foo_converted'), args)
 
+    def test_no_double_type_conversion_of_default(self):
+        def extend(str_to_convert):
+            return str_to_convert + '*'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', type=extend, default='*')
+        args = parser.parse_args([])
+        # The test argument will be two stars, one coming from the default
+        # value and one coming from the type conversion being called exactly
+        # once.
+        self.assertEqual(NS(test='**'), args)
+
     def test_issue_15906(self):
         # Issue #15906: When action='append', type=str, default=[] are
         # providing, the dest value was the string representation "[]" when it