From c17776f96e8654dc9510daf55d90987be2e4dec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 4 Oct 2010 23:59:35 +0000
Subject: [PATCH] Merged revisions 85223 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85223 | eric.araujo | 2010-10-05 01:52:37 +0200 (mar., 05 oct. 2010) | 3 lines

  Fix interaction of custom translation classes and caching (#9042)
........
---
 Lib/gettext.py           |  2 +-
 Lib/test/test_gettext.py | 31 +++++++++++++++++++++++++++++++
 Misc/NEWS                |  3 +++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Lib/gettext.py b/Lib/gettext.py
index 8b8b510a0d9..9973535ac50 100644
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -471,7 +471,7 @@ def translation(domain, localedir=None, languages=None,
     # 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:
diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index d60ece7297b..40dc61af7ae 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -334,6 +334,37 @@ class WeirdMetadataTest(GettextBaseTest):
            'John Doe <jdoe@example.com>\nJane Foobar <jfoobar@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():
     test_support.run_unittest(__name__)
 
diff --git a/Misc/NEWS b/Misc/NEWS
index acdccd1b0db..7b4c6a3c743 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -50,6 +50,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #9042: Fix interaction of custom translation classes and caching in
+  gettext.
+
 - Issue #9065: tarfile no longer uses "root" as the default for the uname and
   gname field.