Remove hachoir from MAT.

This (huge) commit removes completely hachoir from MAT.
Audio files are now processed with mutagen, and images
with exiftool, since the main python imaging library (PIL)
isn't super-great to deal with metadata (and damaged/non-standard
files).

Package maintainer should change the dependencies to reflect this.

1 files changed, 6 insertions, 7 deletions

diff --git a/libmat/archive.py b/libmat/archive.py
index ad9fdc9..2e14538 100644
--- a/libmat/archive.py
+++ b/libmat/archive.py
@@ -20,9 +20,8 @@ class GenericArchiveStripper(parser.GenericParser):
     """ Represent a generic archive
     """
 
-    def __init__(self, filename, parser, mime, backup, is_writable, **kwargs):
-        super(GenericArchiveStripper, self).__init__(filename,
-                                                     parser, mime, backup, is_writable, **kwargs)
+    def __init__(self, filename, mime, backup, is_writable, **kwargs):
+        super(GenericArchiveStripper, self).__init__(filename, mime, backup, is_writable, **kwargs)
         self.compression = ''
         self.add2archive = kwargs['add2archive']
         self.tempdir = tempfile.mkdtemp()
@@ -354,8 +353,8 @@ class GzipStripper(TarStripper):
     """ Represent a tar.gz archive
     """
 
-    def __init__(self, filename, parser, mime, backup, is_writable, **kwargs):
-        super(GzipStripper, self).__init__(filename, parser, mime, backup, is_writable, **kwargs)
+    def __init__(self, filename, mime, backup, is_writable, **kwargs):
+        super(GzipStripper, self).__init__(filename, mime, backup, is_writable, **kwargs)
         self.compression = ':gz'
 
 
@@ -363,6 +362,6 @@ class Bzip2Stripper(TarStripper):
     """ Represent a tar.bz2 archive
     """
 
-    def __init__(self, filename, parser, mime, backup, is_writable, **kwargs):
-        super(Bzip2Stripper, self).__init__(filename, parser, mime, backup, is_writable, **kwargs)
+    def __init__(self, filename, mime, backup, is_writable, **kwargs):
+        super(Bzip2Stripper, self).__init__(filename, mime, backup, is_writable, **kwargs)
         self.compression = ':bz2'