Update merge from 2.7: s/basetring/str

2012-09-12 14:42:34 -04:00 · 2012-09-12 14:42:34 -04:00 · 2dceb359cb
parent eaae1b76ae
commit 2dceb359cb
1 changed files with 1 additions and 1 deletions
--- 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,