summaryrefslogtreecommitdiff
path: root/MAT
diff options
context:
space:
mode:
authorjvoisin2012-12-25 01:48:38 +0100
committerjvoisin2012-12-25 01:48:38 +0100
commit5fd8f1dbb84370c90343e5112951ef5cbea0e3c7 (patch)
treeaf93d15204e40030fc18cb083d10f098800f2fa9 /MAT
parentfb167b988f7e7f578b03449ad2dc75c9413f39b1 (diff)
Partial fix of the testsuite
Diffstat (limited to 'MAT')
-rw-r--r--MAT/office.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/MAT/office.py b/MAT/office.py
index 223fe84..232a3b8 100644
--- a/MAT/office.py
+++ b/MAT/office.py
@@ -83,7 +83,7 @@ class OpenDocumentStripper(archive.GenericArchiveStripper):
83 if os.path.isfile(name): 83 if os.path.isfile(name):
84 try: 84 try:
85 cfile = mat.create_class_file(name, False, 85 cfile = mat.create_class_file(name, False,
86 self.add2archive) 86 add2archive=self.add2archive)
87 cfile.remove_all() 87 cfile.remove_all()
88 logging.debug('Processing %s from %s' % (item, 88 logging.debug('Processing %s from %s' % (item,
89 self.filename)) 89 self.filename))
@@ -107,9 +107,8 @@ class OpenDocumentStripper(archive.GenericArchiveStripper):
107 try: 107 try:
108 zipin.getinfo('meta.xml') 108 zipin.getinfo('meta.xml')
109 except KeyError: # no meta.xml in the file 109 except KeyError: # no meta.xml in the file
110 kwargs = {'backup':self.backup, 'add2archive':self.add2archive}
111 czf = archive.ZipStripper(self.filename, self.parser, 110 czf = archive.ZipStripper(self.filename, self.parser,
112 'application/zip', **kwargs) 111 'application/zip', False, add2archive=self.add2archive)
113 if czf.is_clean(): 112 if czf.is_clean():
114 zipin.close() 113 zipin.close()
115 return True 114 return True
@@ -226,7 +225,7 @@ class OpenXmlStripper(archive.GenericArchiveStripper):
226 if os.path.isfile(name): # don't care about folders 225 if os.path.isfile(name): # don't care about folders
227 try: 226 try:
228 cfile = mat.create_class_file(name, False, 227 cfile = mat.create_class_file(name, False,
229 self.add2archive) 228 add2archive=self.add2archive)
230 cfile.remove_all() 229 cfile.remove_all()
231 logging.debug('Processing %s from %s' % (item, 230 logging.debug('Processing %s from %s' % (item,
232 self.filename)) 231 self.filename))
@@ -251,9 +250,8 @@ class OpenXmlStripper(archive.GenericArchiveStripper):
251 if item.startswith('docProps/'): 250 if item.startswith('docProps/'):
252 return False 251 return False
253 zipin.close() 252 zipin.close()
254 kwargs = {'backup':self.backup, 'add2archive':self.add2archive}
255 czf = archive.ZipStripper(self.filename, self.parser, 253 czf = archive.ZipStripper(self.filename, self.parser,
256 'application/zip', **kwargs) 254 'application/zip', False, add2archive=self.add2archive)
257 return czf.is_clean() 255 return czf.is_clean()
258 256
259 def get_meta(self): 257 def get_meta(self):