diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-07-26 23:06:07 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-07-26 23:06:07 (GMT) |
| commit | 2a20f9be709a805e3af5d9cf5b4fe987b9db7c1c (patch) | |
| tree | 58f58a4bb8e06f3c1ce44c7761ae1ce4bcf42169 | |
| parent | ba2eab25ff54209d119ce9e0c7dd88bdf76b5460 (diff) | |
| download | cpython-2a20f9be709a805e3af5d9cf5b4fe987b9db7c1c.zip cpython-2a20f9be709a805e3af5d9cf5b4fe987b9db7c1c.tar.gz cpython-2a20f9be709a805e3af5d9cf5b4fe987b9db7c1c.tar.bz2 | |
Backport 0398f07d4827 (fix for weird buildbot failures)
| -rw-r--r-- | Lib/test/test_codecs.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_locale.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index 6b84023..4899a59 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 5155923..46e228e 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -393,16 +393,16 @@ 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) locale.setlocale(locale.LC_CTYPE, loc) - self.assertEqual(loc, locale.getlocale()) + self.assertEqual(loc, locale.getlocale(locale.LC_CTYPE)) def test_main(): |