Change isbasestring function as discussed on the cvs list a while ago

0b11c5fd · Christian Heimes · 61792348 · 0b11c5fd
Commit 0b11c5fd authored Jan 27, 2008 by Christian Heimes
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

Lib/optparse.py Lib/optparse.py +7 -4

No files found.
--- a/Lib/optparse.py
+++ b/Lib/optparse.py
@@ -823,11 +823,14 @@ try:
 except NameError:
    (True, False) = (1, 0)
-def isbasestring(x):
+try:
-    try:
+    basestring
+except NameError:
+    def isbasestring(x):
+        return isinstance(x, (types.StringType, types.UnicodeType))
+else:
+    def isbasestring(x):
        return isinstance(x, basestring)
-    except:
-        return isinstance(x, types.StringType) or isinstance(x, types.UnicodeType)
 class Values: