From e7f1b3e1dc488022cde465b1551a3c167ed14ef7 Mon Sep 17 00:00:00 2001 From: Leonardo Rochael Almeida <leonardo@nexedi.com> Date: Wed, 21 Oct 2009 15:09:12 +0000 Subject: [PATCH] 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) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29888 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/tests/testPredicate.py | 2 +- product/PortalTransforms/Transform.py | 2 +- product/PortalTransforms/TransformEngine.py | 8 ++++---- product/PortalTransforms/tests/test_transforms.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/product/ERP5/tests/testPredicate.py b/product/ERP5/tests/testPredicate.py index 9c3214570f..4625d72b03 100644 --- a/product/ERP5/tests/testPredicate.py +++ b/product/ERP5/tests/testPredicate.py @@ -274,7 +274,7 @@ class TestPredicates(TestPredicateMixIn): 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) diff --git a/product/PortalTransforms/Transform.py b/product/PortalTransforms/Transform.py index 30618805da..c0df1429d0 100644 --- a/product/PortalTransforms/Transform.py +++ b/product/PortalTransforms/Transform.py @@ -119,7 +119,7 @@ class Transform(SimpleItem): # 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') diff --git a/product/PortalTransforms/TransformEngine.py b/product/PortalTransforms/TransformEngine.py index c550392f78..2a1c5b7c27 100644 --- a/product/PortalTransforms/TransformEngine.py +++ b/product/PortalTransforms/TransformEngine.py @@ -183,8 +183,8 @@ class TransformTool(UniqueObject, ActionProviderBase, Folder): 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 @@ class TransformTool(UniqueObject, ActionProviderBase, Folder): 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 @@ class TransformTool(UniqueObject, ActionProviderBase, Folder): # 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) diff --git a/product/PortalTransforms/tests/test_transforms.py b/product/PortalTransforms/tests/test_transforms.py index 3c33649743..aa38ced1ee 100644 --- a/product/PortalTransforms/tests/test_transforms.py +++ b/product/PortalTransforms/tests/test_transforms.py @@ -40,7 +40,7 @@ class TransformTest(ATSiteTestCase): 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) -- 2.30.9