XMLExportImport: close files to fix ResourceWarning

product/ERP5/Tool/TrashTool.py

@@ -132,6 +132,8 @@ class TrashTool(BaseTool):
           LOG("Trash Tool backupObject", WARNING,
               "Can't backup object %s" % object_path)
           return {}
+        finally:
+          copy.close()
 
     subobjects_dict = {}
 

product/ERP5Type/XMLExportImport/__init__.py

@@ -411,10 +411,12 @@ def save_record(parser, tag, data):
 
 import xml.parsers.expat
 def importXML(jar, file, clue=''):
-    if type(file) is str:
-        file=open(file, 'rb')
-    outfile=TemporaryFile()
-    data=file.read()
+    if isinstance(file, str):
+        with open(file, 'rb') as f:
+          data = f.read()
+    else:
+        data = file.read()
+    with TemporaryFile() as outfile:
         F=ppml.xmlPickler()
         F.end_handlers['record'] = save_record
         F.end_handlers['ZopeData'] = save_zopedata
@@ -434,7 +436,7 @@ def importXML(jar, file, clue=''):
         p.EndElementHandler=F.unknown_endtag
         r=p.Parse(data)
         outfile.seek(0)
-    return jar.importFile(outfile,clue)
+        return jar.importFile(outfile, clue)
 
 customImporters = {
   magic: importXML