From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 20 Jun 2011 20:07:06 +0000 (+0200)
Subject: Revert d370d609d09b as requested by Terry Jan Reedy:
X-Git-Tag: v2.7.3rc1~682
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecb863b29ecaa4cd48679a45e9f9455b1f717f8b;p=thirdparty%2FPython%2Fcpython.git

Revert d370d609d09b as requested by Terry Jan Reedy:

"#3067: locale.setlocale() accepts a Unicode locale."
---

diff --git a/Lib/locale.py b/Lib/locale.py
index f204b564b93c..bb4aa37b2906 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 not isinstance(locale, basestring):
+    if locale and type(locale) is not type(""):
         # convert to string
         locale = normalize(_build_localename(locale))
     return _setlocale(category, locale)
diff --git a/Misc/NEWS b/Misc/NEWS
index d45582894ca7..2e33e7f5b801 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,8 +16,6 @@ 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.