[Erp5-report] r29888 - in /erp5/trunk/products: ERP5/tests/ PortalTransforms/ PortalTransfo...

[nobody at svn.erp5.org]

Author: leonardo
Date: Wed Oct 21 17:09:12 2009
New Revision: 29888

URL: http://svn.erp5.org?rev=29888&view=rev
Log:
zope.interface.Interface on Zope 2.12 no longer implements the deprecated isImplementedBy method call that got renamed already on Zope 2.8. (approved by jm)

Modified:
    erp5/trunk/products/ERP5/tests/testPredicate.py
    erp5/trunk/products/PortalTransforms/Transform.py
    erp5/trunk/products/PortalTransforms/TransformEngine.py
    erp5/trunk/products/PortalTransforms/tests/test_transforms.py

Modified: erp5/trunk/products/ERP5/tests/testPredicate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testPredicate.py?rev=29888&r1=29887&r2=29888&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testPredicate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testPredicate.py [utf8] Wed Oct 21 17:09:12 2009
@@ -274,7 +274,7 @@
     from Products.ERP5Type.interfaces import IPredicate
     from Products.ERP5Type.Document.Predicate import Predicate
     predicate = self.createPredicate()
-    self.failUnless(IPredicate.isImplementedBy(predicate))
+    self.failUnless(IPredicate.providedBy(predicate))
     from zope.interface.verify import verifyClass
     verifyClass(IPredicate, Predicate)
 

Modified: erp5/trunk/products/PortalTransforms/Transform.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/Transform.py?rev=29888&r1=29887&r2=29888&view=diff
==============================================================================
--- erp5/trunk/products/PortalTransforms/Transform.py [utf8] (original)
+++ erp5/trunk/products/PortalTransforms/Transform.py [utf8] Wed Oct 21 17:09:12 2009
@@ -119,7 +119,7 @@
         # check this is a valid transform
         if not hasattr(transform, '__class__'):
             raise TransformException('Invalid transform : transform is not a class')
-        if not itransform.isImplementedBy(transform):
+        if not itransform.providedBy(transform):
             raise TransformException('Invalid transform : itransform is not implemented by %s' % transform.__class__)
         if not hasattr(transform, 'inputs'):
             raise TransformException('Invalid transform : missing required "inputs" attribute')

Modified: erp5/trunk/products/PortalTransforms/TransformEngine.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/TransformEngine.py?rev=29888&r1=29887&r2=29888&view=diff
==============================================================================
--- erp5/trunk/products/PortalTransforms/TransformEngine.py [utf8] (original)
+++ erp5/trunk/products/PortalTransforms/TransformEngine.py [utf8] Wed Oct 21 17:09:12 2009
@@ -183,8 +183,8 @@
             transform = path[0]
 
         result = transform.convert(orig, data, context=context, usedby=usedby, **kwargs)
-        assert(idatastream.isImplementedBy(result),
-               'result doesn\'t implemented idatastream')
+        assert(idatastream.providedBy(result),
+               'result doesn\'t is not an idatastream')
         self._setMetaData(result, transform)
 
         # set cache if possible
@@ -254,7 +254,7 @@
 
     def _unwrap(self, data):
         """unwrap data from an icache"""
-        if idatastream.isImplementedBy(data):
+        if idatastream.providedBy(data):
             data = data.getData()
         return data
 
@@ -482,7 +482,7 @@
         # register non zope transform
         module = str(transform.__module__)
         transform = Transform(transform.name(), module, transform)
-        if not itransform.isImplementedBy(transform):
+        if not itransform.providedBy(transform):
             raise TransformException('%s does not implement itransform' % transform)
         name = transform.name()
         __traceback_info__ = (name, transform)

Modified: erp5/trunk/products/PortalTransforms/tests/test_transforms.py
URL: http://svn.erp5.org/erp5/trunk/products/PortalTransforms/tests/test_transforms.py?rev=29888&r1=29887&r2=29888&view=diff
==============================================================================
--- erp5/trunk/products/PortalTransforms/tests/test_transforms.py [utf8] (original)
+++ erp5/trunk/products/PortalTransforms/tests/test_transforms.py [utf8] Wed Oct 21 17:09:12 2009
@@ -40,7 +40,7 @@
         input.close()
         data = datastream(self.transform.name())
         res_data = self.transform.convert(orig, data, filename=filename)
-        self.assert_(idatastream.isImplementedBy(res_data))
+        self.assert_(idatastream.providedBy(res_data))
         got = res_data.getData()
         try:
             output = open(output)