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.
........

diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index 69ffcb7d296fbe3372dc0d2cd219c4a4f224f714..634c6071938020abf676308d01c47d8b73af2c38 100644 (file)
--- 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 92188254b6a45149e5bd125f2db4385844345a9e..ff3104468cccf336e25180242ee958d125cbf461 100644 (file)
--- 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.