diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-06-20 20:07:06 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-06-20 20:07:06 (GMT) |
| commit | ecb863b29ecaa4cd48679a45e9f9455b1f717f8b (patch) | |
| tree | 55982f599d8723c120795ec5e77641bd974d6680 | |
| parent | f64a0cffca141fa0a8f1138b5f069ea0da446c9f (diff) | |
| download | cpython-ecb863b29ecaa4cd48679a45e9f9455b1f717f8b.zip cpython-ecb863b29ecaa4cd48679a45e9f9455b1f717f8b.tar.gz cpython-ecb863b29ecaa4cd48679a45e9f9455b1f717f8b.tar.bz2 | |
Revert d370d609d09b as requested by Terry Jan Reedy:
"#3067: locale.setlocale() accepts a Unicode locale."
| -rw-r--r-- | Lib/locale.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Lib/locale.py b/Lib/locale.py index f204b56..bb4aa37 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -525,7 +525,7 @@ def setlocale(category, locale=None): category may be given as one of the LC_* values. """ - if locale and not isinstance(locale, basestring): + if locale and type(locale) is not type(""): # convert to string locale = normalize(_build_localename(locale)) return _setlocale(category, locale) @@ -16,8 +16,6 @@ Core and Builtins Library ------- -- Issue #3067: locale.setlocale() accepts a Unicode locale. - - Issue #11700: mailbox proxy object close methods can now be called multiple times without error, and _ProxyFile now closes the wrapped file. |