[Zope3-checkins] CVS: zopeproducts/xslt - foursuitetransformer.py:1.2 sheet.py:1.2

Philipp von Weitershausen philikon@philikon.de
Wed, 4 Jun 2003 12:43:36 -0400


Update of /cvs-repository/zopeproducts/xslt
In directory cvs.zope.org:/tmp/cvs-serv1980

Modified Files:
	foursuitetransformer.py sheet.py 
Log Message:
* Use the new implements() declaration

* Use zope.proxy instead of deprecated zope.proxy.introspection.


=== zopeproducts/xslt/foursuitetransformer.py 1.1 => 1.2 ===
--- zopeproducts/xslt/foursuitetransformer.py:1.1	Sun Apr 13 11:58:03 2003
+++ zopeproducts/xslt/foursuitetransformer.py	Wed Jun  4 12:43:35 2003
@@ -17,6 +17,7 @@
 
 from StringIO import StringIO
 
+from zope.interface import implements
 from interfaces import IXSLTTransformer, XSLTError
 from zope.component import getAdapter
 from zope.app.interfaces.xml.source import IXMLText
@@ -28,7 +29,7 @@
 
 class XMLText:
 
-    __implements__ = IXMLText
+    implements(IXMLText)
 
     def __init__(self, xml="<doc/>"):
         self.source = xml
@@ -39,7 +40,7 @@
     XSLT transformer using 4Suite
     """
 
-    __implements__ = IXSLTTransformer
+    implements(IXSLTTransformer)
 
     def transform(self, xslt, xml):
         namespaceMap = {} #XXX


=== zopeproducts/xslt/sheet.py 1.1 => 1.2 ===
--- zopeproducts/xslt/sheet.py:1.1	Sun Apr 13 11:58:03 2003
+++ zopeproducts/xslt/sheet.py	Wed Jun  4 12:43:35 2003
@@ -15,10 +15,11 @@
 $Id$
 """
 
+from zope.interface import implements
 from zope.component import getUtility
 from zope.app.interfaces.xml.source import IXMLText
 from zopeproducts.xslt.interfaces import IXSLTSheet, IXSLTTransformer
-from zope.proxy.introspection import removeAllProxies
+from zope.proxy import removeAllProxies
 
 __metaclass__ = type
 
@@ -29,7 +30,7 @@
     Objects of this class instanciated with XSLT data can act as adapter
     factories
     """
-    __implements__ = IXSLTSheet, IXMLText
+    implements(IXSLTSheet, IXMLText)
 
     def __init__(self, xslt_text):
         self.source = xslt_text