fixup! py2/py3: 2to3 -f methodattrs

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):
     """

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__', klass.__setstate__) is \
          persistent_migration.__setstate__:
         # optimization to reduce overhead of compatibility code
         klass.__setstate__ = persistent_migration.Base__setstate__

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)