mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-19 07:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Update merge from 2.7: s/basetring/str

Browse source
This commit is contained in:
Barry Warsaw 2012-09-12 14:42:34 -04:00
parent eaae1b76ae
commit 2dceb359cb
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/argparse.py
View file

@ -1957,7 +1957,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
# twice (which may fail) if the argument was given, but # twice (which may fail) if the argument was given, but
# only if it was defined already in the namespace # only if it was defined already in the namespace
if (action.default is not None and if (action.default is not None and
isinstance(action.default, basestring) and isinstance(action.default, str) and
hasattr(namespace, action.dest) and hasattr(namespace, action.dest) and
action.default is getattr(namespace, action.dest)): action.default is getattr(namespace, action.dest)):
setattr(namespace, action.dest, setattr(namespace, action.dest,