#12776,#11839: call argparse type function only once.

Before, the type function was called twice in the case where the default
was specified and the argument was given as well.  This was especially
problematic for the FileType type, as a default file would always be
opened, even if a file argument was specified on the command line.

Patch by Arnaud Fontaine, with additional test by Mike Meyer.
This commit is contained in:
R David Murray 2012-08-31 23:15:28 -04:00
parent cd366620a9
commit 201018718f
4 changed files with 69 additions and 7 deletions

View File

@ -1705,10 +1705,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
if action.dest is not SUPPRESS: if action.dest is not SUPPRESS:
if not hasattr(namespace, action.dest): if not hasattr(namespace, action.dest):
if action.default is not SUPPRESS: if action.default is not SUPPRESS:
default = action.default setattr(namespace, action.dest, action.default)
if isinstance(action.default, basestring):
default = self._get_value(action, default)
setattr(namespace, action.dest, default)
# add any parser defaults that aren't present # add any parser defaults that aren't present
for dest in self._defaults: for dest in self._defaults:
@ -1936,12 +1933,22 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
if positionals: if positionals:
self.error(_('too few arguments')) self.error(_('too few arguments'))
# make sure all required actions were present # make sure all required actions were present, and convert defaults.
for action in self._actions: for action in self._actions:
if action.required: if action not in seen_actions:
if action not in seen_actions: if action.required:
name = _get_action_name(action) name = _get_action_name(action)
self.error(_('argument %s is required') % name) self.error(_('argument %s is required') % name)
else:
# Convert action default now instead of doing it before
# parsing arguments to avoid calling convert functions
# 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
hasattr(namespace, action.dest) and
action.default is getattr(namespace, action.dest)):
setattr(namespace, action.dest,
self._get_value(action, action.default))
# make sure all required groups had one option present # make sure all required groups had one option present
for group in self._mutually_exclusive_groups: for group in self._mutually_exclusive_groups:

View File

@ -1467,6 +1467,22 @@ class TestFileTypeR(TempDirMixin, ParserTestCase):
('readonly', NS(x=None, spam=RFile('readonly'))), ('readonly', NS(x=None, spam=RFile('readonly'))),
] ]
class TestFileTypeDefaults(TempDirMixin, ParserTestCase):
"""Test that a file is not created unless the default is needed"""
def setUp(self):
super(TestFileTypeDefaults, self).setUp()
file = open(os.path.join(self.temp_dir, 'good'), 'w')
file.write('good')
file.close()
argument_signatures = [
Sig('-c', type=argparse.FileType('r'), default='no-file.txt'),
]
# should provoke no such file error
failures = ['']
# should not provoke error because default file is created
successes = [('-c good', NS(c=RFile('good')))]
class TestFileTypeRB(TempDirMixin, ParserTestCase): class TestFileTypeRB(TempDirMixin, ParserTestCase):
"""Test the FileType option/argument type for reading files""" """Test the FileType option/argument type for reading files"""
@ -4432,6 +4448,38 @@ class TestArgumentTypeError(TestCase):
else: else:
self.fail() self.fail()
# ================================================
# Check that the type function is called only once
# ================================================
class TestTypeFunctionCallOnlyOnce(TestCase):
def test_type_function_call_only_once(self):
def spam(string_to_convert):
self.assertEqual(string_to_convert, 'spam!')
return 'foo_converted'
parser = argparse.ArgumentParser()
parser.add_argument('--foo', type=spam, default='bar')
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
# ================================================================
class TestTypeFunctionCallWithNonStringDefault(TestCase):
def test_type_function_call_with_non_string_default(self):
def spam(int_to_convert):
self.assertEqual(int_to_convert, 0)
return 'foo_converted'
parser = argparse.ArgumentParser()
parser.add_argument('--foo', type=spam, default=0)
args = parser.parse_args([])
self.assertEqual(NS(foo='foo_converted'), args)
# ====================== # ======================
# parse_known_args tests # parse_known_args tests
# ====================== # ======================

View File

@ -271,6 +271,7 @@ Nils Fischbeck
Frederik Fix Frederik Fix
Matt Fleming Matt Fleming
Hernán Martínez Foffani Hernán Martínez Foffani
Arnaud Fontaine
Michael Foord Michael Foord
Amaury Forgeot d'Arc Amaury Forgeot d'Arc
Doug Fort Doug Fort

View File

@ -98,6 +98,12 @@ Core and Builtins
Library Library
------- -------
- Issue #12776,#11839: call argparse type function (specified by add_argument)
only once. Before, the type function was called twice in the case where the
default was specified and the argument was given as well. This was
especially problematic for the FileType type, as a default file would always
be opened, even if a file argument was specified on the command line.
- Issue #13370: Ensure that ctypes works on Mac OS X when Python is - Issue #13370: Ensure that ctypes works on Mac OS X when Python is
compiled using the clang compiler compiled using the clang compiler