[Erp5-report] r42397 nicolas.dumazet - /erp5/trunk/products/ERP5Type/patches/ObjectManager.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Tue Jan 18 08:41:11 2011
New Revision: 42397

URL: http://svn.erp5.org?rev=42397&view=rev
Log:
events only exist since Zope 2.10

Modified:
    erp5/trunk/products/ERP5Type/patches/ObjectManager.py

Modified: erp5/trunk/products/ERP5Type/patches/ObjectManager.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/ObjectManager.py?rev=42397&r1=42396&r2=42397&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/ObjectManager.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/ObjectManager.py [utf8] Tue Jan 18 08:41:11 2011
@@ -14,6 +14,7 @@
 
 # Import: add rename feature and make _importObjectFromFile return the object
 from OFS.ObjectManager import ObjectManager, customImporters
+from App.version_txt import getZopeVersion
 
 def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1, id=None, suppress_events=False):
     #LOG('_importObjectFromFile, filepath',0,filepath)
@@ -30,7 +31,12 @@ def ObjectManager_importObjectFromFile(s
     if id is None:
       id=ob.id
     if hasattr(id, 'im_func'): id=id()
-    self._setObject(id, ob, set_owner=set_owner, suppress_events=suppress_events)
+
+    if getZopeVersion()[1] >= 10:
+      # only in Zope > 2.10
+      self._setObject(id, ob, set_owner=set_owner, suppress_events=suppress_events)
+    else:
+      self._setObject(id, ob, set_owner=set_owner)
 
     # try to make ownership implicit if possible in the context
     # that the object was imported into.