[Python-checkins] r85223 - in python/branches/py3k: Lib/gettext.py Lib/test/test_gettext.py Misc/NEWS

Tue Oct 5 01:52:38 CEST 2010

Author: eric.araujo
Date: Tue Oct 5 01:52:37 2010
New Revision: 85223
Log:
Fix interaction of custom translation classes and caching (#9042)
Modified:
 python/branches/py3k/Lib/gettext.py
 python/branches/py3k/Lib/test/test_gettext.py
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/gettext.py
==============================================================================

--- python/branches/py3k/Lib/gettext.py	(original)
+++ python/branches/py3k/Lib/gettext.py	Tue Oct 5 01:52:37 2010
@@ -419,7 +419,7 @@
 # once.
 result = None
 for mofile in mofiles:
- key = os.path.abspath(mofile)
+ key = (class_, os.path.abspath(mofile))
 t = _translations.get(key)
 if t is None:
 with open(mofile, 'rb') as fp:
Modified: python/branches/py3k/Lib/test/test_gettext.py
==============================================================================
--- python/branches/py3k/Lib/test/test_gettext.py	(original)
+++ python/branches/py3k/Lib/test/test_gettext.py	Tue Oct 5 01:52:37 2010
@@ -335,6 +335,37 @@
 'John Doe <jdoe at example.com>\nJane Foobar <jfoobar at example.com>')
 
 
+class DummyGNUTranslations(gettext.GNUTranslations):
+ def foo(self):
+ return 'foo'
+
+
+class GettextCacheTestCase(GettextBaseTest):
+ def test_cache(self):
+ self.localedir = os.curdir
+ self.mofile = MOFILE
+
+ self.assertEqual(len(gettext._translations), 0)
+
+ t = gettext.translation('gettext', self.localedir)
+
+ self.assertEqual(len(gettext._translations), 1)
+
+ t = gettext.translation('gettext', self.localedir,
+ class_=DummyGNUTranslations)
+
+ self.assertEqual(len(gettext._translations), 2)
+ self.assertEqual(t.__class__, DummyGNUTranslations)
+
+ # Calling it again doesn't add to the cache
+
+ t = gettext.translation('gettext', self.localedir,
+ class_=DummyGNUTranslations)
+
+ self.assertEqual(len(gettext._translations), 2)
+ self.assertEqual(t.__class__, DummyGNUTranslations)
+
+
 def test_main():
 support.run_unittest(__name__)
 
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Tue Oct 5 01:52:37 2010
@@ -88,6 +88,9 @@
 Library
 -------
 
+- Issue #9042: Fix interaction of custom translation classes and caching in
+ gettext.
+
 - Issue 6706: asyncore.dispatcher now provides a handle_accepted() method 
 returning a (sock, addr) pair which is called when a connection has been
 established with a new remote endpoint. This is supposed to be used as a 
