Merge branches 'gi_jack' and 'gtk3'

Conflicts:
	mat-gui

1 files changed, 4 insertions, 3 deletions

diff --git a/MAT/archive.py b/MAT/archive.py
index 8127665..74100a9 100644
--- a/MAT/archive.py
+++ b/MAT/archive.py
@@ -10,7 +10,8 @@ import tempfile
 
 import parser
 import mat
-from tarfile import tarfile
+#from tarfile import tarfile
+import tarfile
 
 
 class GenericArchiveStripper(parser.GenericParser):
@@ -159,8 +160,8 @@ class TarStripper(GenericArchiveStripper):
         return current_file
 
     def remove_all(self):
-        tarin = tarfile.open(self.filename, 'r' + self.compression)
-        tarout = tarfile.open(self.output, 'w' + self.compression)
+        tarin = tarfile.open(self.filename, 'r' + self.compression, encoding='utf-8')
+        tarout = tarfile.open(self.output, 'w' + self.compression, encoding='utf-8')
         for item in tarin.getmembers():
             tarin.extract(item, self.tempdir)
             name = os.path.join(self.tempdir, item.name)