Senthil Kumaran committed 41a2327 Merge

merge heads

Comments (0)

Files changed (2)

         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)
+- 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.