From: Barry Warsaw <barry@python.org>
Date: Wed, 12 Sep 2012 18:42:34 +0000 (-0400)
Subject: Update merge from 2.7: s/basetring/str
X-Git-Tag: v3.2.4rc1~531
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dceb359cb0353d4f327fc36be27e67a3e94566e;p=thirdparty%2FPython%2Fcpython.git

Update merge from 2.7: s/basetring/str
---

diff --git a/Lib/argparse.py b/Lib/argparse.py
index e2677f81d695..eb894caebc20 100644
--- 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,