From: Éric Araujo <merwok@netwok.org>
Date: Sat, 6 Nov 2010 04:35:07 +0000 (+0000)
Subject: Merged revisions 86239,86241 via svnmerge from
X-Git-Tag: v3.1.3rc1~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c1340b30a9d113b76818e52b5ed101c4867b79a;p=thirdparty%2FPython%2Fcpython.git

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 69ffcb7d296f..634c60719380 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 92188254b6a4..ff3104468ccc 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.