diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-23 14:20:41 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-23 14:20:41 (GMT) |
| commit | d2f4cb8cca1212b50824139d852dda846f10621a (patch) | |
| tree | 957f101e9bb1873e52e4d874a7ee6f71539ae9e0 /Lib/optparse.py | |
| parent | 2c634425863d034965857cb0092fa98c4b3832e6 (diff) | |
| download | cpython-d2f4cb8cca1212b50824139d852dda846f10621a.zip cpython-d2f4cb8cca1212b50824139d852dda846f10621a.tar.gz cpython-d2f4cb8cca1212b50824139d852dda846f10621a.tar.bz2 | |
Fixed bug #1915: Python compiles with --enable-unicode=no again. However several extension methods and modules do not work without unicode support.
Diffstat (limited to 'Lib/optparse.py')
| -rw-r--r-- | Lib/optparse.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/optparse.py b/Lib/optparse.py index 62d2f7e..4fbe094 100644 --- a/Lib/optparse.py +++ b/Lib/optparse.py @@ -824,7 +824,11 @@ except NameError: (True, False) = (1, 0) def isbasestring(x): - return isinstance(x, types.StringType) or isinstance(x, types.UnicodeType) + try: + return isinstance(x, basestring) + except: + return isinstance(x, types.StringType) or isinstance(x, types.UnicodeType) + class Values: |