diff options
| author | R David Murray <rdmurray@bitdance.com> | 2012-08-31 22:45:20 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2012-08-31 22:45:20 -0400 |
| commit | 05738d1a250d3733e67d0e487b460ce9559445c7 (patch) | |
| tree | 134ea06371425a7b00b7896a47713351ab202583 /Lib/argparse.py | |
| parent | d62555882ed6dcbaae1f898bd99b33208da9c0bb (diff) | |
| download | cpython-05738d1a250d3733e67d0e487b460ce9559445c7.tar.gz | |
#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.
Diffstat (limited to 'Lib/argparse.py')
| -rw-r--r-- | Lib/argparse.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index 0ee8c0865e..f77c0c2d75 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1714,10 +1714,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): if action.dest is not SUPPRESS: if not hasattr(namespace, action.dest): if action.default is not SUPPRESS: - default = action.default - if isinstance(action.default, str): - default = self._get_value(action, default) - setattr(namespace, action.dest, default) + setattr(namespace, action.dest, action.default) # add any parser defaults that aren't present for dest in self._defaults: @@ -1945,12 +1942,22 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): if positionals: 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: - if action.required: - if action not in seen_actions: + if action not in seen_actions: + if action.required: name = _get_action_name(action) 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 for group in self._mutually_exclusive_groups: |