[Python-checkins] r60371 - python/branches/release25-maint/Lib/optparse.py

[christian.heimes]

Author: christian.heimes
Date: Sun Jan 27 20:01:59 2008
New Revision: 60371

Modified:
   python/branches/release25-maint/Lib/optparse.py
Log:
Change isbasestring function as discussed on the cvs list a while ago

Modified: python/branches/release25-maint/Lib/optparse.py
==============================================================================
--- python/branches/release25-maint/Lib/optparse.py	(original)
+++ python/branches/release25-maint/Lib/optparse.py	Sun Jan 27 20:01:59 2008
@@ -823,11 +823,14 @@
 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: