From 2dceb359cb0353d4f327fc36be27e67a3e94566e Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Wed, 12 Sep 2012 14:42:34 -0400 Subject: Update merge from 2.7: s/basetring/str --- Lib/argparse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ 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, -- cgit v0.12