[Zope-Checkins] CVS: Zope3/lib/python/Zope/I18n - TranslationService.py:1.5

[Barry Warsaw]

Update of /cvs-repository/Zope3/lib/python/Zope/I18n
In directory cvs.zope.org:/tmp/cvs-serv11642/lib/python/Zope/I18n

Modified Files:
	TranslationService.py 
Log Message:
Use absolute import paths instead of relative intra-package paths.

Get rid of empty docstrings.

A few other minor code cleanups.


=== Zope3/lib/python/Zope/I18n/TranslationService.py 1.4 => 1.5 ===
 from Zope.App.OFS.Container.IContainer import IHomogenousContainer
 
-from Negotiator import negotiator
-from Domain import Domain
-from IMessageCatalog import IMessageCatalog
-from ITranslationService import ITranslationService
-from SimpleTranslationService import SimpleTranslationService
+from Zope.I18n.Negotiator import negotiator
+from Zope.I18n.Domain import Domain
+from Zope.I18n.IMessageCatalog import IMessageCatalog
+from Zope.I18n.ITranslationService import ITranslationService
+from Zope.I18n.SimpleTranslationService import SimpleTranslationService
 
 
 class ILocalTranslationService(ITranslationService,
@@ -41,12 +41,10 @@
 
 
 class TranslationService(BTreeContainer, SimpleTranslationService):
-    ''' '''
 
     __implements__ =  ILocalTranslationService
 
     def __init__(self, default_domain='global'):
-        ''' '''
         super(TranslationService, self).__init__()
         self._catalogs = OOBTree()
         self.default_domain = default_domain
@@ -82,7 +80,6 @@
         self._unregisterMessageCatalog(object.getLanguage(),
                                        object.getDomain(), name)
 
-
     def isAddable(self, interfaces):
         """See Zope.App.OFS.Container.IContainer.IWriteContainer"""
         if type(interfaces) != TupleType:
@@ -139,14 +136,14 @@
         filter = filter.replace('%', '.*')
         filter_re = re.compile(filter)
         
-        msg_ids = {}
+        msgids = {}
         languages = self.getAvailableLanguages(domain)
         for language in languages:
             for name in self._catalogs[(language, domain)]:
-                for id in self[name].getMessageIds():
-                    if filter_re.match(id) >= 0:
-                        msg_ids[id] = None
-        return msg_ids.keys()
+                for msgid in self[name].getMessageIds():
+                    if filter_re.match(msgid) >= 0:
+                        msgids[msgid] = None
+        return msgids.keys()
 
 
     def getAllLanguages(self):