summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-11-06 04:36:28 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-11-06 04:36:28 (GMT)
commite28665aa8ebbb452dba5e7e95a7ecd167f9fdb69 (patch)
treeedf21627c8ac98dca3c87860d25f442d4c6c1d80
parentd1feff70a3c08f91066b99a74ee1ca8f65bdfec1 (diff)
downloadcpython-e28665aa8ebbb452dba5e7e95a7ecd167f9fdb69.zip
cpython-e28665aa8ebbb452dba5e7e95a7ecd167f9fdb69.tar.gz
cpython-e28665aa8ebbb452dba5e7e95a7ecd167f9fdb69.tar.bz2
Merged revisions 86239,86241 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86239 | eric.araujo | 2010-11-06 05:09:29 +0100 (sam., 06 nov. 2010) | 2 lines Fix caching error found by regrtest -R (#10229) ........ r86241 | eric.araujo | 2010-11-06 05:24:00 +0100 (sam., 06 nov. 2010) | 2 lines Add missing NEWS entry for r86239. ........
-rw-r--r--Lib/test/test_gettext.py1
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index 40dc61a..65b395b 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -75,6 +75,7 @@ class GettextBaseTest(unittest.TestCase):
fp.close()
self.env = test_support.EnvironmentVarGuard()
self.env['LANGUAGE'] = 'xx'
+ gettext._translations.clear()
def tearDown(self):
self.env.__exit__()
diff --git a/Misc/NEWS b/Misc/NEWS
index a578b8a..21552c1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -69,6 +69,8 @@ Core and Builtins
Library
-------
+- Issue #10229: Fix caching error in gettext.
+
- Issue #10252: Close file objects in a timely manner in distutils code and
tests. Patch by Brian Brazil, completed by Éric Araujo.