[Erp5-report] r41911 gabriel - /erp5/trunk/utils/cloudooo/cloudooo/document.py

[nobody at svn.erp5.org]

Author: gabriel
Date: Fri Dec 31 12:10:47 2010
New Revision: 41911

URL: http://svn.erp5.org?rev=41911&view=rev
Log:
refactor code to remove zipfile only if it is replaced by another file

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/document.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/document.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/document.py?rev=41911&r1=41910&r2=41911&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/document.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/document.py [utf8] Fri Dec 31 12:10:47 2010
@@ -75,6 +75,7 @@ class FileSystemDocument(object):
       zip_filename_list = zipfile.namelist()
       if 'mimetype' not in zip_filename_list and \
           '[Content_Types].xml' not in zip_filename_list:
+        zipfile_path = file_path
         zipfile.extractall(path=self.directory_name)
         zipfile.close()
         filename_list = listdir(self.directory_name)
@@ -86,6 +87,8 @@ class FileSystemDocument(object):
             if mimetypes.guess_type(filename)[0] in mimetype_list:
               file_path = join(self.directory_name, filename)
               break
+        if zipfile_path != file_path:
+          remove(zipfile_path)
     return file_path
 
   def getContent(self, zip=False):