diff options
| author | Barry Warsaw <barry@python.org> | 2012-09-12 19:31:38 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2012-09-12 19:31:38 (GMT) |
| commit | d89774e1581ad2ca03ba06876d0fe4f2a2d8ff91 (patch) | |
| tree | c765a7143fe958d03e4b92d2a8b75b7fac714387 /Lib/test/test_argparse.py | |
| parent | 77c45538f79a1b0110e088d256a222d68563354d (diff) | |
| parent | 2dceb359cb0353d4f327fc36be27e67a3e94566e (diff) | |
| download | cpython-d89774e1581ad2ca03ba06876d0fe4f2a2d8ff91.zip cpython-d89774e1581ad2ca03ba06876d0fe4f2a2d8ff91.tar.gz cpython-d89774e1581ad2ca03ba06876d0fe4f2a2d8ff91.tar.bz2 | |
Merge 3.2 fix updates and tests for issue #15906.
Diffstat (limited to 'Lib/test/test_argparse.py')
| -rw-r--r-- | Lib/test/test_argparse.py | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index ff02ee7..c06c940 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -4591,11 +4591,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): @@ -4605,8 +4605,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 |