diff options
| author | Barry Warsaw <barry@python.org> | 2012-09-12 18:42:34 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2012-09-12 18:42:34 (GMT) |
| commit | 2dceb359cb0353d4f327fc36be27e67a3e94566e (patch) | |
| tree | b9eb0d1aa527bc87b1f8afd5e90feb7561fc1f73 | |
| parent | eaae1b76aecd2c2fc1cf1aa1578db69e7d1464e6 (diff) | |
| download | cpython-2dceb359cb0353d4f327fc36be27e67a3e94566e.zip cpython-2dceb359cb0353d4f327fc36be27e67a3e94566e.tar.gz cpython-2dceb359cb0353d4f327fc36be27e67a3e94566e.tar.bz2 | |
Update merge from 2.7: s/basetring/str
| -rw-r--r-- | Lib/argparse.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index e2677f8..eb894ca 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1957,7 +1957,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.default, basestring) and + isinstance(action.default, str) and hasattr(namespace, action.dest) and action.default is getattr(namespace, action.dest)): setattr(namespace, action.dest, |