[Python-checkins] r86243 - in python/branches/release27-maint: Lib/test/test_gettext.py Misc/NEWS

[eric.araujo]

Author: eric.araujo
Date: Sat Nov  6 05:36:28 2010
New Revision: 86243

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/test/test_gettext.py
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Lib/test/test_gettext.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_gettext.py	(original)
+++ python/branches/release27-maint/Lib/test/test_gettext.py	Sat Nov  6 05:36:28 2010
@@ -75,6 +75,7 @@
         fp.close()
         self.env = test_support.EnvironmentVarGuard()
         self.env['LANGUAGE'] = 'xx'
+        gettext._translations.clear()
 
     def tearDown(self):
         self.env.__exit__()

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sat Nov  6 05:36:28 2010
@@ -69,6 +69,8 @@
 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.