commit 2dceb359cb0353d4f327fc36be27e67a3e94566e
author Barry Warsaw <barry@python.org> Wed Sep 12 14:42:34 2012 -0400
committer Barry Warsaw <barry@python.org> Wed Sep 12 14:42:34 2012 -0400
tree b9eb0d1aa527bc87b1f8afd5e90feb7561fc1f73
parent eaae1b76aecd2c2fc1cf1aa1578db69e7d1464e6

Update merge from 2.7: s/basetring/str

Lib/argparse.py

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 @@
                     # 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,