[Python-checkins] cpython (2.7): Issue #25742: Try to fix test_locale on Windows
victor.stinner
python-checkins at python.org
Sun Nov 29 10:33:24 EST 2015
https://hg.python.org/cpython/rev/d7481ebeaa4f
changeset: 99387:d7481ebeaa4f
branch: 2.7
user: Victor Stinner <victor.stinner at gmail.com>
date: Sun Nov 29 16:33:18 2015 +0100
summary:
Issue #25742: Try to fix test_locale on Windows
files:
Lib/test/test_locale.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -494,14 +494,14 @@
self.assertEqual(locale.normalize(u'en_US'), 'en_US.ISO8859-1')
def test_setlocale_unicode(self):
- old_loc = locale.getlocale(locale.LC_ALL)
- try:
- user_locale = locale.setlocale(locale.LC_ALL, '')
- unicode_locale = user_locale.decode('utf-8')
- user_locale2 = locale.setlocale(locale.LC_ALL, unicode_locale)
- self.assertEqual(user_locale, user_locale2)
- finally:
- locale.setlocale(locale.LC_ALL, old_loc)
+ oldlocale = locale.getlocale()
+ self.addCleanup(locale.setlocale, locale.LC_CTYPE, oldlocale)
+
+ user_locale = locale.setlocale(locale.LC_CTYPE, '')
+ unicode_locale = user_locale.decode('utf-8')
+
+ user_locale2 = locale.setlocale(locale.LC_CTYPE, unicode_locale)
+ self.assertEqual(user_locale, user_locale2)
def test_main():
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list