Commit bc9023c8 authored by Jérome Perrin's avatar Jérome Perrin

fixup! Merge remote-tracking branch 'origin/master' into zope4py2

parent 807dc150
Pipeline #21158 failed with stage
in 0 seconds
......@@ -12,15 +12,13 @@
#
##############################################################################
# Import: add rename feature and make _importObjectFromFile return the object
from OFS.ObjectManager import ObjectManager
from OFS.XMLExportImport import importXML
from OFS.XMLExportImport import magic
customImporters={magic: importXML,
}
from Products.ERP5Type.XMLExportImport import magic, importXML
customImporters = {magic: importXML}
import OFS.ObjectManager
OFS.ObjectManager.customImporters = customImporters
# Import: add rename feature and make _importObjectFromFile return the object
def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1, id=None, suppress_events=False):
#LOG('_importObjectFromFile, filepath',0,filepath)
# locate a valid connection
......@@ -46,4 +44,4 @@ def ObjectManager_importObjectFromFile(self, filepath, verify=1, set_owner=1, id
ob.manage_changeOwnershipType(explicit=0)
return ob
ObjectManager._importObjectFromFile=ObjectManager_importObjectFromFile
OFS.ObjectManager.ObjectManager._importObjectFromFile=ObjectManager_importObjectFromFile
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