From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 26 Jul 2011 21:55:33 +0000 (+0200)
Subject: Try to fix weird buildbot failures
X-Git-Tag: v3.3.0a1~1837
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d05066d1eefcba422dbe3ebd50017905eac57af8;p=thirdparty%2FPython%2Fcpython.git

Try to fix weird buildbot failures
---

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 247e2b824cc5..7a9e38cfd6cf 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -1234,7 +1234,7 @@ class CodecsModuleTest(unittest.TestCase):
     def test_lookup_issue1813(self):
         # Issue #1813: under Turkish locales, lookup of some codecs failed
         # because 'I' is lowercased as "ı" (dotless i)
-        oldlocale = locale.getlocale(locale.LC_CTYPE)
+        oldlocale = locale.setlocale(locale.LC_CTYPE)
         self.addCleanup(locale.setlocale, locale.LC_CTYPE, oldlocale)
         try:
             locale.setlocale(locale.LC_CTYPE, 'tr_TR')
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 413c54758341..16689a3abfcb 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -393,18 +393,18 @@ class TestMiscellaneous(unittest.TestCase):
 
     def test_getsetlocale_issue1813(self):
         # Issue #1813: setting and getting the locale under a Turkish locale
-        oldlocale = locale.getlocale()
+        oldlocale = locale.setlocale(locale.LC_CTYPE)
         self.addCleanup(locale.setlocale, locale.LC_CTYPE, oldlocale)
         try:
             locale.setlocale(locale.LC_CTYPE, 'tr_TR')
         except locale.Error:
             # Unsupported locale on this system
             self.skipTest('test needs Turkish locale')
-        loc = locale.getlocale()
+        loc = locale.getlocale(locale.LC_CTYPE)
         if verbose:
             print('got locale %a' % (loc,))
         locale.setlocale(locale.LC_CTYPE, loc)
-        self.assertEqual(loc, locale.getlocale())
+        self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE))
 
 
 def test_main():