summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-11-06 04:35:07 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-11-06 04:35:07 (GMT)
commit1c1340b30a9d113b76818e52b5ed101c4867b79a (patch)
tree46809ae49ee8b4114c8fdbeb7e1579b432d1e68f
parentc6d7ead095fdd3b1ee82a338d4ffd88b2c2c2fce (diff)
downloadcpython-1c1340b30a9d113b76818e52b5ed101c4867b79a.zip
cpython-1c1340b30a9d113b76818e52b5ed101c4867b79a.tar.gz
cpython-1c1340b30a9d113b76818e52b5ed101c4867b79a.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 69ffcb7..634c607 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 = support.EnvironmentVarGuard()
self.env['LANGUAGE'] = 'xx'
+ gettext._translations.clear()
def tearDown(self):
self.env.__exit__()
diff --git a/Misc/NEWS b/Misc/NEWS
index 9218825..ff31044 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,8 @@ C-API
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.