Update merge from 2.7: s/basetring/str

warsaw · warsaw · commit 2dceb359cb03 · 2012-09-12T14:42:34.000-04:00
diff --git a/Lib/argparse.py b/Lib/argparse.py
@@ -1957,7 +1957,7 @@ def consume_positionals(start_index):
                     # 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,
