Commit 1f014ac2 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Jérome Perrin

fixup! py2/py3: 2to3 -f methodattrs

parent 6a76114b
...@@ -72,7 +72,7 @@ class DummyMovement(Movement): ...@@ -72,7 +72,7 @@ class DummyMovement(Movement):
parent = self.getParentValue() parent = self.getParentValue()
if isinstance(parent, DummyDelivery): if isinstance(parent, DummyDelivery):
self = parent self = parent
return DummyDelivery.getSimulationState.__func__(self) return DummyDelivery.getSimulationState(self)
def getDeliveryValue(self): def getDeliveryValue(self):
""" """
......
...@@ -371,7 +371,7 @@ class PortalTypeMetaClass(GhostBaseMetaClass, PropertyHolder): ...@@ -371,7 +371,7 @@ class PortalTypeMetaClass(GhostBaseMetaClass, PropertyHolder):
for key, value in six.iteritems(attribute_dict): for key, value in six.iteritems(attribute_dict):
setattr(klass, key, value) setattr(klass, key, value)
if getattr(klass.__setstate__, 'im_func', None) is \ if getattr(klass.__setstate__, '__func__', klass.__setstate__) is \
persistent_migration.__setstate__: persistent_migration.__setstate__:
# optimization to reduce overhead of compatibility code # optimization to reduce overhead of compatibility code
klass.__setstate__ = persistent_migration.Base__setstate__ klass.__setstate__ = persistent_migration.Base__setstate__
......
...@@ -32,7 +32,7 @@ def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1, id ...@@ -32,7 +32,7 @@ def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1, id
if verify: self._verifyObjectPaste(ob, validate_src=0) if verify: self._verifyObjectPaste(ob, validate_src=0)
if id is None: if id is None:
id=ob.id 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) self._setObject(id, ob, set_owner=set_owner, suppress_events=suppress_events)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment