# HG changeset patch
# User cmlenz
# Date 1180514631 0
# Node ID 04527ede83d0d2f7b94cc362b55445a23b4e7536
# Parent  1b4a4b8ed14afa93c666bc0b3e6ee08c2766446f
Fixes for the extended translations class.

diff --git a/babel/__init__.py b/babel/__init__.py
--- a/babel/__init__.py
+++ b/babel/__init__.py
@@ -26,7 +26,7 @@
 :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
--- a/babel/catalog/__init__.py
+++ b/babel/catalog/__init__.py
@@ -29,7 +29,7 @@
         :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 @@
                  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):