[Zope3-checkins] CVS: Zope3/src/zope/app/services/translation - filters.py:1.4.12.1 messagecatalog.py:1.5.12.1 translationservice.py:1.10.10.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/app/services/translation
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/services/translation

Modified Files:
      Tag: cw-mail-branch
	filters.py messagecatalog.py translationservice.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/services/translation/filters.py 1.4 => 1.4.12.1 ===
--- Zope3/src/zope/app/services/translation/filters.py:1.4	Thu Apr 17 16:05:12 2003
+++ Zope3/src/zope/app/services/translation/filters.py	Sun Jun 22 10:23:29 2003
@@ -21,6 +21,7 @@
 from zope.i18n.interfaces import IMessageExportFilter
 from zope.i18n.interfaces import IMessageImportFilter
 from zope.app.interfaces.services.translation import ILocalTranslationService
+from zope.interface import implements
 
 
 class ParseError(Exception):
@@ -35,7 +36,7 @@
 
 class GettextExportFilter:
 
-    __implements__ =  IMessageExportFilter
+    implements(IMessageExportFilter)
     __used_for__ = ILocalTranslationService
 
 
@@ -80,7 +81,7 @@
 
 class GettextImportFilter:
 
-    __implements__ =  IMessageImportFilter
+    implements(IMessageImportFilter)
     __used_for__ = ILocalTranslationService
 
 


=== Zope3/src/zope/app/services/translation/messagecatalog.py 1.5 => 1.5.12.1 ===
--- Zope3/src/zope/app/services/translation/messagecatalog.py:1.5	Fri Apr 18 18:12:29 2003
+++ Zope3/src/zope/app/services/translation/messagecatalog.py	Sun Jun 22 10:23:29 2003
@@ -15,12 +15,12 @@
 
 $Id$
 """
-from zope.interface import classProvides
+from zope.interface import classProvides, providedBy, implements
 import time
 
 from zodb.btrees.OOBTree import OOBTree
 from persistence import Persistent
-from zope.proxy.introspection import removeAllProxies
+from zope.proxy import removeAllProxies
 from zope.component.interfaces import IFactory
 from zope.app.security.registries.registeredobject import RegisteredObject
 from zope.app.interfaces.services.translation import ILocalMessageCatalog
@@ -28,7 +28,7 @@
 
 class MessageCatalog(RegisteredObject, Persistent):
 
-    __implements__ =  ILocalMessageCatalog
+    implements(ILocalMessageCatalog)
     classProvides(IFactory)
 
     def __init__(self, language, domain="default"):
@@ -99,4 +99,4 @@
 
     def getInterfaces(self):
         'See IFactory'
-        return self.__implements__
+        return tuple(providedBy(self))


=== Zope3/src/zope/app/services/translation/translationservice.py 1.10 => 1.10.10.1 ===
--- Zope3/src/zope/app/services/translation/translationservice.py:1.10	Thu May  1 15:35:35 2003
+++ Zope3/src/zope/app/services/translation/translationservice.py	Sun Jun 22 10:23:30 2003
@@ -29,11 +29,12 @@
 from zope.i18n.negotiator import negotiator
 from zope.app.interfaces.services.translation import ILocalTranslationService
 from zope.i18n.simpletranslationservice import SimpleTranslationService
+from zope.interface import implements
 
 
 class TranslationService(BTreeContainer, SimpleTranslationService):
 
-    __implements__ =  ILocalTranslationService, ISimpleService
+    implements(ILocalTranslationService, ISimpleService)
 
     def __init__(self, default_domain='global'):
         super(TranslationService, self).__init__()