From: Brett Cannon <bcannon@gmail.com>
Date: Wed, 8 Sep 2004 02:02:41 +0000 (+0000)
Subject: Remove usage of locale.getlocale in favor or setlocale(LC_NUMERIC, None) .
X-Git-Tag: v2.4b1~321
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85ae1a69b63451cdcfeb45af699ea0c014971217;p=thirdparty%2FPython%2Fcpython.git

Remove usage of locale.getlocale in favor or setlocale(LC_NUMERIC, None) .
Also added a comment about why the code is bother to see what setlocale thinks
the set locale is.

Closes bug #1023798.
---

diff --git a/Lib/test/test__locale.py b/Lib/test/test__locale.py
index e0f64ec74560..abf7a5be2751 100644
--- a/Lib/test/test__locale.py
+++ b/Lib/test/test__locale.py
@@ -1,7 +1,6 @@
 from test.test_support import verbose, TestSkipped, run_unittest
 from _locale import (setlocale, LC_NUMERIC, RADIXCHAR, THOUSEP, nl_langinfo,
                     localeconv, Error)
-from locale import getlocale
 import unittest
 
 candidate_locales = ['es_UY', 'fr_FR', 'fi_FI', 'es_CO', 'pt_PT', 'it_IT',
@@ -33,11 +32,18 @@ class _LocaleTests(unittest.TestCase):
                             (THOUSEP, "thousands_sep")):
                 nl_radixchar = nl_langinfo(li)
                 li_radixchar = localeconv()[lc]
+                # Both with seeing what the locale is set to in order to detect
+                # when setlocale lies and says it accepted the locale setting
+                # but in actuality didn't use it (as seen in OS X 10.3)
+                try:
+                    set_locale = setlocale(LC_NUMERIC)
+                except Error:
+                    set_locale = "<not able to determine>"
                 self.assertEquals(nl_radixchar, li_radixchar,
-                                    "%r != %r (%s); "
+                                    "%s != %s (%s); "
                                     "supposed to be %s, set to %s" %
                                         (nl_radixchar, li_radixchar, lc,
-                                         loc, getlocale(LC_NUMERIC)[0]))
+                                         loc, set_locale))
 
 def test_main():
     run_unittest(_LocaleTests)