(original) (raw)

changeset: 70902:d370d609d09b branch: 2.7 parent: 70891:6c16a31e0442 user: Victor Stinner victor.stinner@haypocalc.com date: Mon Jun 20 16:14:48 2011 +0200 files: Lib/locale.py Misc/NEWS description: Close #3067: locale.setlocale() accepts a Unicode locale. diff -r 6c16a31e0442 -r d370d609d09b Lib/locale.py --- a/Lib/locale.py Sun Jun 19 17:45:36 2011 -0700 +++ b/Lib/locale.py Mon Jun 20 16:14:48 2011 +0200 @@ -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 -r 6c16a31e0442 -r d370d609d09b Misc/NEWS --- a/Misc/NEWS Sun Jun 19 17:45:36 2011 -0700 +++ b/Misc/NEWS Mon Jun 20 16:14:48 2011 +0200 @@ -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. /victor.stinner@haypocalc.com