mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-21 09:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Revert d370d609d09b as requested by Terry Jan Reedy:

Browse source 
"#3067: locale.setlocale() accepts a Unicode locale."
This commit is contained in:
Victor Stinner 2011-06-20 22:07:06 +02:00
parent f64a0cffca
commit ecb863b29e
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/locale.py
View file

@ -525,7 +525,7 @@ def setlocale(category, locale=None):
category may be given as one of the LC_* values. 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 # convert to string
locale = normalize(_build_localename(locale)) locale = normalize(_build_localename(locale))
return _setlocale(category, locale) return _setlocale(category, locale)

2
Misc/NEWS
View file

@ -16,8 +16,6 @@ Core and Builtins
Library Library
------- -------
- Issue #3067: locale.setlocale() accepts a Unicode locale.
- Issue #11700: mailbox proxy object close methods can now be called multiple - Issue #11700: mailbox proxy object close methods can now be called multiple
times without error, and _ProxyFile now closes the wrapped file. times without error, and _ProxyFile now closes the wrapped file.