summaryrefslogtreecommitdiff
path: root/lib/office.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/office.py')
-rw-r--r--lib/office.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/office.py b/lib/office.py
index 9c9d367..33af48e 100644
--- a/lib/office.py
+++ b/lib/office.py
@@ -62,14 +62,12 @@ class OpenDocumentStripper(archive.GenericArchiveStripper):
62 if not 'meta.xml' in line: 62 if not 'meta.xml' in line:
63 print line 63 print line
64 zipout.write(name, item) 64 zipout.write(name, item)
65 mat.secure_remove(name)
66 65
67 elif ext in parser.NOMETA or item == 'mimetype': 66 elif ext in parser.NOMETA or item == 'mimetype':
68 #keep NOMETA files, and the "manifest" file 67 #keep NOMETA files, and the "manifest" file
69 if item != 'meta.xml': # contains the metadata 68 if item != 'meta.xml': # contains the metadata
70 zipin.extract(item, self.tempdir) 69 zipin.extract(item, self.tempdir)
71 zipout.write(name, item) 70 zipout.write(name, item)
72 mat.secure_remove(name)
73 71
74 else: 72 else:
75 zipin.extract(item, self.tempdir) 73 zipin.extract(item, self.tempdir)
@@ -88,7 +86,6 @@ class OpenDocumentStripper(archive.GenericArchiveStripper):
88 logging.info('%s\' fileformat is not supported' % item) 86 logging.info('%s\' fileformat is not supported' % item)
89 if self.add2archive: 87 if self.add2archive:
90 zipout.write(name, item) 88 zipout.write(name, item)
91 mat.secure_remove(name)
92 zipout.comment = '' 89 zipout.comment = ''
93 logging.info('%s treated' % self.filename) 90 logging.info('%s treated' % self.filename)
94 zipin.close() 91 zipin.close()
@@ -208,7 +205,6 @@ class OpenXmlStripper(archive.GenericArchiveStripper):
208 #keep parser.NOMETA files, and the file named ".rels" 205 #keep parser.NOMETA files, and the file named ".rels"
209 zipin.extract(item, self.tempdir) 206 zipin.extract(item, self.tempdir)
210 zipout.write(name, item) 207 zipout.write(name, item)
211 mat.secure_remove(name)
212 else: 208 else:
213 zipin.extract(item, self.tempdir) 209 zipin.extract(item, self.tempdir)
214 if os.path.isfile(name): # don't care about folders 210 if os.path.isfile(name): # don't care about folders
@@ -226,7 +222,6 @@ class OpenXmlStripper(archive.GenericArchiveStripper):
226 logging.info('%s\' fileformat is not supported' % item) 222 logging.info('%s\' fileformat is not supported' % item)
227 if self.add2archive: 223 if self.add2archive:
228 zipout.write(name, item) 224 zipout.write(name, item)
229 mat.secure_remove(name)
230 zipout.comment = '' 225 zipout.comment = ''
231 logging.info('%s treated' % self.filename) 226 logging.info('%s treated' % self.filename)
232 zipin.close() 227 zipin.close()