Mercurial > babel > mirror
changeset 603:60f716236946 trunk
update Translations.load to use new parameter name ('fp' instead of 'fileobj'), regression introduced in r653
| author | fschwarz |
|---|---|
| date | Wed, 22 Aug 2012 20:28:32 +0000 |
| parents | 7a8ee579f31e |
| children | bf5d10a56bbe |
| files | babel/support.py babel/tests/support.py |
| diffstat | 2 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/babel/support.py +++ b/babel/support.py @@ -555,7 +555,7 @@ filename = gettext.find(domain, dirname, locales) if not filename: return NullTranslations() - return cls(fileobj=open(filename, 'rb'), domain=domain) + return cls(fp=open(filename, 'rb'), domain=domain) def __repr__(self): return '<%s: "%s">' % (type(self).__name__,
--- a/babel/tests/support.py +++ b/babel/tests/support.py @@ -14,7 +14,9 @@ import doctest import inspect import os +import shutil from StringIO import StringIO +import tempfile import unittest from babel import support @@ -163,6 +165,20 @@ self.assertEqualTypeToo( 'VohsCTXD1', self.translations.ldnpgettext('messages1', 'foo', 'foo1', 'foos1', 2)) + + def test_load(self): + tempdir = tempfile.mkdtemp() + try: + messages_dir = os.path.join(tempdir, 'fr', 'LC_MESSAGES') + os.makedirs(messages_dir) + catalog = Catalog(locale='fr', domain='messages') + catalog.add('foo', 'bar') + write_mo(file(os.path.join(messages_dir, 'messages.mo'), 'wb'), catalog) + + translations = support.Translations.load(tempdir, locales=('fr',), domain='messages') + self.assertEqual('bar', translations.gettext('foo')) + finally: + shutil.rmtree(tempdir) class NullTranslationsTestCase(unittest.TestCase):