summaryrefslogtreecommitdiffstats
path: root/Lib/locale.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-04-27 23:53:51 (GMT)
committerGuido van Rossum <guido@python.org>2007-04-27 23:53:51 (GMT)
commit572dbf8f1320c0b34b9c786e5c30ba4a4b61b292 (patch)
tree27763a28b40b577302161008a00539649e2a536d /Lib/locale.py
parentd4617f24caa1827106f5ca5e74655adf919ea499 (diff)
downloadcpython-572dbf8f1320c0b34b9c786e5c30ba4a4b61b292.zip
cpython-572dbf8f1320c0b34b9c786e5c30ba4a4b61b292.tar.gz
cpython-572dbf8f1320c0b34b9c786e5c30ba4a4b61b292.tar.bz2
Checkpoint. Manipulated things so that string literals are always
unicode, and a few other compensating changes, e.g. str <- unicode, chr <- unichr, and repr() of a unicode string no longer starts with 'u'. Lots of unit tests are broken, but some basic things work, in particular distutils works so the extensions can be built, and test_builtin.py works.
Diffstat (limited to 'Lib/locale.py')
-rw-r--r--Lib/locale.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/locale.py b/Lib/locale.py
index d3294ce..35f4a79 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -470,7 +470,7 @@ def setlocale(category, locale=None):
category may be given as one of the LC_* values.
"""
- if locale and type(locale) is not type(""):
+ if locale and not isinstance(locale, basestring):
# convert to string
locale = normalize(_build_localename(locale))
return _setlocale(category, locale)