From cffdcc1b1e78d48cad62c54432a9d8ce41f4d616 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 27 Dec 2012 17:01:30 +0100 Subject: Refactor the archive parser Refactoring of the archive and office parser, in order to simplify the code and reduce abstraction --- MAT/archive.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'MAT/archive.py') diff --git a/MAT/archive.py b/MAT/archive.py index 69c8f1b..1dcddef 100644 --- a/MAT/archive.py +++ b/MAT/archive.py @@ -35,9 +35,6 @@ class GenericArchiveStripper(parser.GenericParser): shutil.rmtree(self.tempdir) def remove_all(self): - return self._remove_all() - - def _remove_all(self): raise NotImplementedError @@ -113,7 +110,7 @@ harmless format' % item.filename) zipin.close() return metadata - def _remove_all(self): + def remove_all(self): ''' So far, the zipfile module does not allow to write a ZipInfo object into a zipfile (and it's a shame !) : so data added @@ -162,7 +159,7 @@ class TarStripper(GenericArchiveStripper): current_file.gname = '' return current_file - def _remove_all(self): + def remove_all(self): tarin = tarfile.open(self.filename, 'r' + self.compression) tarout = tarfile.open(self.output, 'w' + self.compression) for item in tarin.getmembers(): -- cgit v1.3