[Python-checkins] cpython (merge 2.7 -> 2.7): merge heads

[senthil.kumaran]

http://hg.python.org/cpython/rev/41a23277a35a
changeset:   70906:41a23277a35a
branch:      2.7
parent:      70905:51ad2d4390bc
parent:      70902:d370d609d09b
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Mon Jun 20 07:37:03 2011 -0700
summary:
  merge heads

files:
  Lib/locale.py |  2 +-
  Misc/NEWS     |  2 ++
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/locale.py b/Lib/locale.py
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -525,7 +525,7 @@
         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)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,8 @@
 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.
 

-- 
Repository URL: http://hg.python.org/cpython