From c36c6ccb416de0fc4a6635339fa7a7657085a1b7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 20 Jun 2011 16:14:48 +0200 Subject: [PATCH] Close #3067: locale.setlocale() accepts a Unicode locale. --- Lib/locale.py | 2 +- Misc/NEWS | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/locale.py b/Lib/locale.py index bb4aa37b290..f204b564b93 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 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 index 2e33e7f5b80..d45582894ca 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,8 @@ 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.