[Python-checkins] cpython (3.2): Update merge from 2.7: s/basetring/str

barry.warsaw python-checkins at python.org
Wed Sep 12 21:31:57 CEST 2012


http://hg.python.org/cpython/rev/5c754e7559ff
changeset:   79016:5c754e7559ff
branch:      3.2
user:        Barry Warsaw <barry at python.org>
date:        Wed Sep 12 14:42:34 2012 -0400
summary:
  Update merge from 2.7: s/basetring/str

files:
  Lib/argparse.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


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

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list