From: Christopher Lenz <cmlenz@gmail.com>
Date: Wed, 30 May 2007 08:43:51 +0000 (+0000)
Subject: Fixes for the extended translations class.
X-Git-Tag: 1.0~624
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6632a31de8dfbb5dfa81bfb54e2ec781671ba712;p=thirdparty%2Fbabel.git

Fixes for the extended translations class.
---

diff --git a/babel/__init__.py b/babel/__init__.py
index cca0636f..f74dcbf4 100644
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -26,7 +26,7 @@ This package is basically composed of two major parts:
 :see: http://www.unicode.org/cldr/
 """
 
-from babel.core import Locale
+from babel.core import *
 
 __docformat__ = 'restructuredtext en'
 __version__ = __import__('pkg_resources').get_distribution('Babel').version
diff --git a/babel/catalog/__init__.py b/babel/catalog/__init__.py
index 3f99b352..653185b0 100644
--- a/babel/catalog/__init__.py
+++ b/babel/catalog/__init__.py
@@ -29,7 +29,7 @@ class Translations(gettext.GNUTranslations):
         :param fileobj: the file-like object the translation should be read
                         from
         """
-        GNUTranslations.__init__(self, fp=fileobj)
+        gettext.GNUTranslations.__init__(self, fp=fileobj)
         self.files = [getattr(fileobj, 'name')]
 
     def load(cls, dirname=None, locales=None, domain=DEFAULT_DOMAIN):
@@ -44,11 +44,13 @@ class Translations(gettext.GNUTranslations):
                  matching translations were found
         :rtype: `Translations`
         """
+        if not isinstance(locales, (list, tuple)):
+            locales = [locales]
         locales = [str(locale) for locale in locales]
         filename = gettext.find(domain, dirname, locales)
         if not filename:
-            return NullTranslations()
-        return cls(open(filename, 'rb'))
+            return gettext.NullTranslations()
+        return cls(fileobj=open(filename, 'rb'))
     load = classmethod(load)
 
     def merge(self, translations):