[kupu-checkins] r54981 - in kupu/trunk/kupu: doc plone plone/tests

[ldr at codespeak.net]

Author: ldr
Date: Tue May 20 04:40:08 2008
New Revision: 54981

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/html2captioned.py
   kupu/trunk/kupu/plone/interfaces.py
   kupu/trunk/kupu/plone/kupu2html.py
   kupu/trunk/kupu/plone/librarytool.py
   kupu/trunk/kupu/plone/tests/test_html2captioned.py
Log:
Purged old Zope2 Interface interfaces for compatibility with Zope 2.12 and Plone 4, while maintaining compatibility
with pre Plone 4 versions of Products.PortalTransforms. [elro]

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Tue May 20 04:40:08 2008
@@ -4,6 +4,10 @@
 
 - SVN (unreleased)
 
+  - Purged old Zope2 Interface interfaces for compatibility with Zope 2.12 and Plone 4, while maintaining compatibility
+    with pre Plone 4 versions of Products.PortalTransforms.
+    [elro]
+
   - Plone tickets
 
     * 7958 Kupu: Insert image: KeyError: 'info' (Error 503 loading kupucollection.xml?resource_type=mediaobject)

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Tue May 20 04:40:08 2008
@@ -8,6 +8,7 @@
 # an appropriate chunk of HTML to include the caption.
 #
 from Products.PortalTransforms.interfaces import itransform
+from Products.PortalTransforms.z3.interfaces import ITransform
 from DocumentTemplate.DT_Util import html_quote
 from DocumentTemplate.DT_Var import newline_to_br
 from Products.CMFCore.utils import getToolByName
@@ -18,6 +19,7 @@
 from Acquisition import aq_base
 from htmlentitydefs import name2codepoint
 from Products.kupu.plone.config import UID_PATTERN
+from zope.interface import implements
 
 name2codepoint = name2codepoint.copy()
 name2codepoint['apos']=ord("'")
@@ -70,6 +72,7 @@
 
 class HTMLToCaptioned:
     """Transform which adds captions to images embedded in HTML"""
+    implements(ITransform)
     __implements__ = itransform
     __name__ = "html_to_captioned"
     inputs = ('text/html',)

Modified: kupu/trunk/kupu/plone/interfaces.py
==============================================================================
--- kupu/trunk/kupu/plone/interfaces.py	(original)
+++ kupu/trunk/kupu/plone/interfaces.py	Tue May 20 04:40:08 2008
@@ -11,7 +11,7 @@
 
 $Id$
 """
-from Interface import Interface
+from zope.interface import Interface
 
 class ILibraryManager(Interface):
     """Provide an interface for managing and retrieving libraries for

Modified: kupu/trunk/kupu/plone/kupu2html.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu2html.py	(original)
+++ kupu/trunk/kupu/plone/kupu2html.py	Tue May 20 04:40:08 2008
@@ -8,11 +8,14 @@
 # this version expects to work on text/x-html-raw
 
 from Products.PortalTransforms.interfaces import itransform
+from Products.PortalTransforms.z3.interfaces import ITransform
 from Products.kupu.plone import html2captioned
 from Products.CMFCore.utils import getToolByName
+from zope.interface import implements
 
 class KupuOutputTransform(html2captioned.HTMLToCaptioned):
     """Transform which adds captions to images embedded in HTML"""
+    implements(ITransform)
     __implements__ = itransform
     __name__ = "kupu_raw_to_html"
     inputs = ('text/x-html-raw',)

Modified: kupu/trunk/kupu/plone/librarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/librarytool.py	(original)
+++ kupu/trunk/kupu/plone/librarytool.py	Tue May 20 04:40:08 2008
@@ -19,6 +19,7 @@
 from Products.PageTemplates.Expressions import getEngine, SecureModuleImporter
 from Products.kupu.plone.interfaces import IKupuLibraryTool
 from Products.CMFCore.utils import getToolByName
+from zope.interface import implements
 
 class KupuError(Exception): pass
 NEWTYPE_IGNORE, NEWTYPE_ADD = 0, 1
@@ -29,7 +30,7 @@
 class KupuLibraryTool(Acquisition.Implicit):
     """A tool to aid Kupu libraries"""
 
-    __implements__ = IKupuLibraryTool
+    implements(IKupuLibraryTool)
 
     def __init__(self):
         self._libraries = []

Modified: kupu/trunk/kupu/plone/tests/test_html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_html2captioned.py	Tue May 20 04:40:08 2008
@@ -8,6 +8,7 @@
 from os.path import join, abspath, dirname
 
 from Products.PortalTransforms.tests.test_transforms import *
+from Products.PortalTransforms.z3.interfaces import IDataStream
 from Products.PortalTransforms.tests.utils import normalize_html
 from Products.kupu import kupu_globals
 
@@ -39,7 +40,7 @@
         input.close()
         data = datastream(self.transform.name())
         res_data = self.transform.convert(orig, data, filename=filename, context=self.portal)
-        self.assert_(idatastream.isImplementedBy(res_data))
+        self.assert_(IDataStream.providedBy(res_data))
         got = res_data.getData()
         try:
             output = open(output)