Commit 7d40761f authored by Arnaud Fontaine's avatar Arnaud Fontaine

Revert adding suppress_events to _setObject as it is not available in

Zope 2.8



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40257 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b95a45b1
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
# Import: add rename feature and make _importObjectFromFile return the object # Import: add rename feature and make _importObjectFromFile return the object
from OFS.ObjectManager import ObjectManager, customImporters from OFS.ObjectManager import ObjectManager, customImporters
def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1, def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1, id=None):
id=None, suppress_events=False):
#LOG('_importObjectFromFile, filepath',0,filepath) #LOG('_importObjectFromFile, filepath',0,filepath)
# locate a valid connection # locate a valid connection
connection=self._p_jar connection=self._p_jar
...@@ -31,8 +30,7 @@ def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1, ...@@ -31,8 +30,7 @@ def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1,
if id is None: if id is None:
id=ob.id id=ob.id
if hasattr(id, 'im_func'): id=id() if hasattr(id, 'im_func'): id=id()
self._setObject(id, ob, set_owner=set_owner, self._setObject(id, ob, set_owner=set_owner)
suppress_events=suppress_events)
# try to make ownership implicit if possible in the context # try to make ownership implicit if possible in the context
# that the object was imported into. # that the object was imported into.
......
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