Update merge from 2.7: s/basetring/str

diff --git a/Lib/argparse.py b/Lib/argparse.py
index e2677f81d6958a62cabd77bc8123e26faba692bf..eb894caebc20f57347116bebfbebc866390af2e9 100644 (file)
--- 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,