From e03522ecd0f0ea31fecc0b0bc1c58bee2173f65f Mon Sep 17 00:00:00 2001 From: Kazuhiko SHIOZAKI <kazuhiko@nexedi.com> Date: Fri, 30 Sep 2022 11:07:59 +0200 Subject: [PATCH] fixup! py2/py3: 2to3 -f methodattrs --- .../portal_components/document.erp5.DummyMovement.py | 2 +- product/ERP5Type/dynamic/lazy_class.py | 2 +- product/ERP5Type/patches/ObjectManager.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.py b/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.py index 88dcceca2e..93d2a00829 100644 --- a/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.py +++ b/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.py @@ -72,7 +72,7 @@ class DummyMovement(Movement): parent = self.getParentValue() if isinstance(parent, DummyDelivery): self = parent - return DummyDelivery.getSimulationState.__func__(self) + return DummyDelivery.getSimulationState(self) def getDeliveryValue(self): """ diff --git a/product/ERP5Type/dynamic/lazy_class.py b/product/ERP5Type/dynamic/lazy_class.py index e6e580bc3c..0ba6ac0ee9 100644 --- a/product/ERP5Type/dynamic/lazy_class.py +++ b/product/ERP5Type/dynamic/lazy_class.py @@ -371,7 +371,7 @@ class PortalTypeMetaClass(GhostBaseMetaClass, PropertyHolder): for key, value in six.iteritems(attribute_dict): setattr(klass, key, value) - if getattr(klass.__setstate__, 'im_func', None) is \ + if getattr(klass.__setstate__, '__func__', None) is \ persistent_migration.__setstate__: # optimization to reduce overhead of compatibility code klass.__setstate__ = persistent_migration.Base__setstate__ diff --git a/product/ERP5Type/patches/ObjectManager.py b/product/ERP5Type/patches/ObjectManager.py index c96e5609ec..fb19541caa 100644 --- a/product/ERP5Type/patches/ObjectManager.py +++ b/product/ERP5Type/patches/ObjectManager.py @@ -32,7 +32,7 @@ def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1, id if verify: self._verifyObjectPaste(ob, validate_src=0) if id is None: id=ob.id - if hasattr(id, 'im_func'): id=id() + if hasattr(id, '__func__'): id=id() self._setObject(id, ob, set_owner=set_owner, suppress_events=suppress_events) -- 2.30.9