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 40dc61af7ae6477502177ecad67ea57bca71e512..65b395b460499aeeff97ff548f631fabbcd516b9 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 = 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 a578b8a642dd20c422e3d7c3e2c373db178f5016..21552c137c5882e3b2347c76ba282048b911c7b8 100644 (file)
--- 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.