[Zope3-checkins] CVS: Zope3/src/zope/tal - dummyengine.py:1.10.2.1 interfaces.py:1.7.2.1 taldefs.py:1.5.2.1 talgettext.py:1.13.2.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/tal
In directory cvs.zope.org:/tmp/cvs-serv28993/src/zope/tal

Modified Files:
      Tag: cw-mail-branch
	dummyengine.py interfaces.py taldefs.py talgettext.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/tal/dummyengine.py 1.10 => 1.10.2.1 ===
--- Zope3/src/zope/tal/dummyengine.py:1.10	Tue May 20 16:29:06 2003
+++ Zope3/src/zope/tal/dummyengine.py	Sun Jun 22 10:27:00 2003
@@ -213,7 +213,7 @@
 
 
 class DummyTranslationService:
-    __implements__ = ITranslationService
+    implements(ITranslationService)
 
     def translate(self, msgid, domain=None, mapping=None, context=None,
                   target_language=None, default=None):


=== Zope3/src/zope/tal/interfaces.py 1.7 => 1.7.2.1 ===
--- Zope3/src/zope/tal/interfaces.py:1.7	Tue May 20 16:29:06 2003
+++ Zope3/src/zope/tal/interfaces.py	Sun Jun 22 10:27:00 2003
@@ -161,7 +161,7 @@
 
         """
 
-        
+
 class ITALExpressionErrorInfo(Interface):
 
     type = Attribute("type",


=== Zope3/src/zope/tal/taldefs.py 1.5 => 1.5.2.1 ===
--- Zope3/src/zope/tal/taldefs.py:1.5	Tue May 20 16:29:06 2003
+++ Zope3/src/zope/tal/taldefs.py	Sun Jun 22 10:27:00 2003
@@ -16,6 +16,7 @@
 """
 
 from zope.tal.interfaces import ITALExpressionErrorInfo
+from zope.interface import implements
 
 TAL_VERSION = "1.4"
 
@@ -92,8 +93,7 @@
 
 
 class ErrorInfo:
-
-    __implements__ = ITALExpressionErrorInfo
+    implements(ITALExpressionErrorInfo)
 
     def __init__(self, err, position=(None, None)):
         if isinstance(err, Exception):
@@ -104,7 +104,6 @@
             self.value = None
         self.lineno = position[0]
         self.offset = position[1]
-
 
 
 import re


=== Zope3/src/zope/tal/talgettext.py 1.13 => 1.13.2.1 ===
--- Zope3/src/zope/tal/talgettext.py:1.13	Tue May 20 16:29:06 2003
+++ Zope3/src/zope/tal/talgettext.py	Sun Jun 22 10:27:00 2003
@@ -34,6 +34,7 @@
 import getopt
 import traceback
 
+from zope.interface import implements
 from zope.tal.htmltalparser import HTMLTALParser
 from zope.tal.talinterpreter import TALInterpreter
 from zope.tal.dummyengine import DummyEngine
@@ -87,7 +88,7 @@
 
 
 class POEngine(DummyEngine):
-    __implements__ = ITALExpressionEngine
+    implements(ITALExpressionEngine)
 
     def __init__(self, macros=None):
         self.catalog = {}
@@ -106,7 +107,8 @@
         return True # dummy
 
     def translate(self, msgid, domain=None, mapping=None, default=None,
-                  # XXX position is not part of the ITALExpressionEngine interface
+                  # XXX position is not part of the ITALExpressionEngine
+                  #     interface
                   position=None):
         # assume domain and mapping are ignored; if they are not,
         # unit test must be updated.