26 files changed, 41 insertions, 41 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 57c97d0..fb0af66 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,7 +2,7 @@ include README README.security LICENSE mat mat-gui
 include TODO mat.desktop
 include mat.1 mat-gui.1
 recursive-include data *
-recursive-include MAT *.py
+recursive-include libmat *.py
 recursive-include test *.py clean.* dirty.*
 recursive-include po *
 recursive-include nautilus *.py
diff --git a/RELEASE b/RELEASE
index 3a34cd7..99e6fcf 100644
--- a/RELEASE
+++ b/RELEASE
@@ -9,10 +9,10 @@ update changelog:
     git log -> CHANGELOG
 
 update version number (Don't be affraid to use -rc or -beta)
-    MAT/mat.py -> __version__ = $VERSION
+    libmat/mat.py -> __version__ = $VERSION
 
 commit release changes
-    git commit CHANGELOG MAT/mat.py
+    git commit CHANGELOG libmat/mat.py
 
 create a tag
     git tag -s $VERSION
diff --git a/MAT/__init__.py b/libmat/__init__.py
index 8b13789..8b13789 100644
--- a/MAT/__init__.py
+++ b/libmat/__init__.py
diff --git a/MAT/archive.py b/libmat/archive.py
index d483dcc..d483dcc 100644
--- a/MAT/archive.py
+++ b/libmat/archive.py
diff --git a/MAT/audio.py b/libmat/audio.py
index dae9d75..dae9d75 100644
--- a/MAT/audio.py
+++ b/libmat/audio.py
diff --git a/MAT/bencode/__init__.py b/libmat/bencode/__init__.py
index 8b13789..8b13789 100644
--- a/MAT/bencode/__init__.py
+++ b/libmat/bencode/__init__.py
diff --git a/MAT/bencode/bencode.py b/libmat/bencode/bencode.py
index a0cc99a..a0cc99a 100644
--- a/MAT/bencode/bencode.py
+++ b/libmat/bencode/bencode.py
diff --git a/MAT/exceptions.py b/libmat/exceptions.py
index 47da15c..47da15c 100644
--- a/MAT/exceptions.py
+++ b/libmat/exceptions.py
diff --git a/MAT/exiftool.py b/libmat/exiftool.py
index 9e38f04..9e38f04 100644
--- a/MAT/exiftool.py
+++ b/libmat/exiftool.py
diff --git a/MAT/hachoir_editor/__init__.py b/libmat/hachoir_editor/__init__.py
index 1835676..1835676 100644
--- a/MAT/hachoir_editor/__init__.py
+++ b/libmat/hachoir_editor/__init__.py
diff --git a/MAT/hachoir_editor/field.py b/libmat/hachoir_editor/field.py
index 6b1efe3..6b1efe3 100644
--- a/MAT/hachoir_editor/field.py
+++ b/libmat/hachoir_editor/field.py
diff --git a/MAT/hachoir_editor/fieldset.py b/libmat/hachoir_editor/fieldset.py
index b7c9b07..b7c9b07 100644
--- a/MAT/hachoir_editor/fieldset.py
+++ b/libmat/hachoir_editor/fieldset.py
diff --git a/MAT/hachoir_editor/typed_field.py b/libmat/hachoir_editor/typed_field.py
index 0f0427b..0f0427b 100644
--- a/MAT/hachoir_editor/typed_field.py
+++ b/libmat/hachoir_editor/typed_field.py
diff --git a/MAT/images.py b/libmat/images.py
index 67c710f..67c710f 100644
--- a/MAT/images.py
+++ b/libmat/images.py
diff --git a/MAT/mat.py b/libmat/mat.py
index 5b1fbda..8dfc2dc 100644
--- a/MAT/mat.py
+++ b/libmat/mat.py
@@ -12,7 +12,7 @@ import xml.sax
 import hachoir_core.cmd_line
 import hachoir_parser
 
-import MAT.exceptions
+import libmat.exceptions
 
 __version__ = '0.5.2'
 __author__ = 'jvoisin'
@@ -117,7 +117,7 @@ def secure_remove(filename):
         os.chmod(filename, 220)
     except OSError:
         logging.error('Unable to add write rights to %s' % filename)
-        raise MAT.exceptions.UnableToWriteFile
+        raise libmat.exceptions.UnableToWriteFile
 
     try:
         if not subprocess.call(['shred', '--remove', filename]):
@@ -131,7 +131,7 @@ def secure_remove(filename):
         os.remove(filename)
     except OSError:
         logging.error('Unable to remove %s' % filename)
-        raise MAT.exceptions.UnableToRemoveFile
+        raise libmat.exceptions.UnableToRemoveFile
 
     return True
 
diff --git a/MAT/misc.py b/libmat/misc.py
index 450f381..450f381 100644
--- a/MAT/misc.py
+++ b/libmat/misc.py
diff --git a/MAT/mutagenstripper.py b/libmat/mutagenstripper.py
index 403c9a7..403c9a7 100644
--- a/MAT/mutagenstripper.py
+++ b/libmat/mutagenstripper.py
diff --git a/MAT/office.py b/libmat/office.py
index 0ca1ff1..0ca1ff1 100644
--- a/MAT/office.py
+++ b/libmat/office.py
diff --git a/MAT/parser.py b/libmat/parser.py
index 1765da8..1765da8 100644
--- a/MAT/parser.py
+++ b/libmat/parser.py
diff --git a/MAT/strippers.py b/libmat/strippers.py
index aea98da..aea98da 100644
--- a/MAT/strippers.py
+++ b/libmat/strippers.py
diff --git a/mat b/mat
index d1a2f06..03a7367 100755
--- a/mat
+++ b/mat
@@ -10,9 +10,9 @@ import os
 
 import hachoir_core
 
-from MAT import mat
-from MAT import strippers
-from MAT import archive
+from libmat import mat
+from libmat import strippers
+from libmat import archive
 
 
 def parse():
diff --git a/mat-gui b/mat-gui
index 96c9e53..5de5865 100755
--- a/mat-gui
+++ b/mat-gui
@@ -13,10 +13,10 @@ import sys
 import xml.sax
 import urllib2
 
-from MAT import mat
-from MAT import strippers
-from MAT import parser
-from MAT import archive
+from libmat import mat
+from libmat import strippers
+from libmat import parser
+from libmat import archive
 
 logging.basicConfig(level=mat.LOGGING_LEVEL)
 
diff --git a/nautilus/nautilus-mat.py b/nautilus/nautilus-mat.py
index 19b601e..f270ed8 100644
--- a/nautilus/nautilus-mat.py
+++ b/nautilus/nautilus-mat.py
@@ -16,8 +16,8 @@ except:
 
 from gi.repository import Nautilus, GObject, Gtk
 
-import MAT.mat
-import MAT.strippers
+import libmat.mat
+import libmat.strippers
 
 
 class MatExtension(GObject.GObject, Nautilus.MenuProvider):
@@ -33,7 +33,7 @@ class MatExtension(GObject.GObject, Nautilus.MenuProvider):
 
         # We're only going to put ourselves on supported mimetypes' context menus
         if not (file.get_mime_type()
-                in [i["mimetype"] for i in MAT.mat.list_supported_formats()]):
+                in [i["mimetype"] for i in libmat.mat.list_supported_formats()]):
             logging.debug("%s is not supported by MAT" % file.get_mime_type())
             return
 
@@ -70,7 +70,7 @@ class MatExtension(GObject.GObject, Nautilus.MenuProvider):
 
         file_path = urllib.unquote(file.get_uri()[7:])
 
-        class_file = MAT.mat.create_class_file(file_path,
+        class_file = libmat.mat.create_class_file(file_path,
                                            backup=True,
                                            add2archive=False)
         if class_file:
diff --git a/setup.py b/setup.py
index 61a602e..6694d44 100755
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ setup(
     platforms         = 'linux',
     license           = 'GPLv2',
     url               = 'https://mat.boum.org',
-    packages          = ['MAT', 'MAT.hachoir_editor', 'MAT.bencode'],
+    packages          = ['libmat', 'libmat.hachoir_editor', 'libmat.bencode'],
     scripts           = ['mat', 'mat-gui'],
     data_files        = [
         ( 'share/applications', ['mat.desktop'] ),
diff --git a/test/clitest.py b/test/clitest.py
index ad895f5..13d545a 100644
--- a/test/clitest.py
+++ b/test/clitest.py
@@ -12,7 +12,7 @@ import sys
 import tarfile
 
 sys.path.append('..')
-from MAT import mat
+from libmat import mat
 import test
 
 
diff --git a/test/libtest.py b/test/libtest.py
index fdef091..1b25f86 100644
--- a/test/libtest.py
+++ b/test/libtest.py
@@ -14,7 +14,7 @@ import test
 import unittest
 
 sys.path.append('..')
-import MAT
+import libmat
 
 
 class TestRemovelib(test.MATTest):
@@ -23,17 +23,17 @@ class TestRemovelib(test.MATTest):
     def test_remove(self):
         '''make sure that the lib remove all compromizing meta'''
         for _, dirty in self.file_list:
-            current_file = MAT.mat.create_class_file(dirty, False, add2archive=True)
+            current_file = libmat.mat.create_class_file(dirty, False, add2archive=True)
             current_file.remove_all()
-            current_file = MAT.mat.create_class_file(dirty, False, add2archive=True)
+            current_file = libmat.mat.create_class_file(dirty, False, add2archive=True)
             self.assertTrue(current_file.is_clean())
 
     def test_remove_empty(self):
         '''Test removal with clean files'''
         for clean, _ in self.file_list:
-            current_file = MAT.mat.create_class_file(clean, False, add2archive=True)
+            current_file = libmat.mat.create_class_file(clean, False, add2archive=True)
             current_file.remove_all()
-            current_file = MAT.mat.create_class_file(clean, False, add2archive=True)
+            current_file = libmat.mat.create_class_file(clean, False, add2archive=True)
             self.assertTrue(current_file.is_clean())
 
 
@@ -43,13 +43,13 @@ class TestListlib(test.MATTest):
     def test_list(self):
         '''check if get_meta returns metadata'''
         for _, dirty in self.file_list:
-            current_file = MAT.mat.create_class_file(dirty, False, add2archive=True)
+            current_file = libmat.mat.create_class_file(dirty, False, add2archive=True)
             self.assertIsNotNone(current_file.get_meta())
 
     def testlist_list_empty(self):
         '''check that a listing of a clean file returns an empty dict'''
         for clean, _ in self.file_list:
-            current_file = MAT.mat.create_class_file(clean, False, add2archive=True)
+            current_file = libmat.mat.create_class_file(clean, False, add2archive=True)
             self.assertEqual(current_file.get_meta(), dict())
 
 
@@ -59,13 +59,13 @@ class TestisCleanlib(test.MATTest):
     def test_dirty(self):
         '''test is_clean on dirty files'''
         for _, dirty in self.file_list:
-            current_file = MAT.mat.create_class_file(dirty, False, add2archive=True)
+            current_file = libmat.mat.create_class_file(dirty, False, add2archive=True)
             self.assertFalse(current_file.is_clean())
 
     def test_clean(self):
         '''test is_clean on clean files'''
         for clean, _ in self.file_list:
-            current_file = MAT.mat.create_class_file(clean, False, add2archive=True)
+            current_file = libmat.mat.create_class_file(clean, False, add2archive=True)
             self.assertTrue(current_file.is_clean())
 
 
@@ -75,12 +75,12 @@ class TestFileAttributes(unittest.TestCase):
     '''
     def test_not_exist(self):
         ''' test MAT's behaviour on non-existent file'''
-        self.assertFalse(MAT.mat.create_class_file('non_existent_file', False, add2archive=True))
+        self.assertFalse(libmat.mat.create_class_file('non_existent_file', False, add2archive=True))
 
     def test_empty(self):
         ''' test MAT's behaviour on empty file'''
         open('empty_file', 'a').close()
-        self.assertFalse(MAT.mat.create_class_file('empty_file', False, add2archive=True))
+        self.assertFalse(libmat.mat.create_class_file('empty_file', False, add2archive=True))
         os.remove('empty_file')
 
 
@@ -91,12 +91,12 @@ class TestSecureRemove(unittest.TestCase):
         ''' test the secure removal of an existing file
         '''
         _, file_to_remove = tempfile.mkstemp()
-        self.assertTrue(MAT.mat.secure_remove(file_to_remove))
+        self.assertTrue(libmat.mat.secure_remove(file_to_remove))
 
     def test_remove_fail(self):
         ''' test the secure removal of an non-removable file
         '''
-        self.assertRaises(MAT.exceptions.UnableToWriteFile, MAT.mat.secure_remove, '/NOTREMOVABLE')
+        self.assertRaises(libmat.exceptions.UnableToWriteFile, libmat.mat.secure_remove, '/NOTREMOVABLE')
 
 
 class TestArchiveProcessing(test.MATTest):
@@ -111,9 +111,9 @@ class TestArchiveProcessing(test.MATTest):
             tar.add(dirty)
             tar.add(clean)
         tar.close()
-        current_file = MAT.mat.create_class_file(tarpath, False, add2archive=False)
+        current_file = libmat.mat.create_class_file(tarpath, False, add2archive=False)
         current_file.remove_all()
-        current_file = MAT.mat.create_class_file(tarpath, False, add2archive=False)
+        current_file = libmat.mat.create_class_file(tarpath, False, add2archive=False)
         self.assertTrue(current_file.is_clean())
 
     def test_remove_tar(self):
@@ -125,9 +125,9 @@ class TestArchiveProcessing(test.MATTest):
             tar.add(dirty)
             tar.add(clean)
         tar.close()
-        current_file = MAT.mat.create_class_file(tarpath, False, add2archive=False)
+        current_file = libmat.mat.create_class_file(tarpath, False, add2archive=False)
         current_file.remove_all()
-        current_file = MAT.mat.create_class_file(tarpath, False, add2archive=False)
+        current_file = libmat.mat.create_class_file(tarpath, False, add2archive=False)
         self.assertTrue(current_file.is_clean())
 
     def test_remove_gz(self):
@@ -139,9 +139,9 @@ class TestArchiveProcessing(test.MATTest):
             tar.add(dirty)
             tar.add(clean)
         tar.close()
-        current_file = MAT.mat.create_class_file(tarpath, False, add2archive=False)
+        current_file = libmat.mat.create_class_file(tarpath, False, add2archive=False)
         current_file.remove_all()
-        current_file = MAT.mat.create_class_file(tarpath, False, add2archive=False)
+        current_file = libmat.mat.create_class_file(tarpath, False, add2archive=False)
         self.assertTrue(current_file.is_clean())
 
     def test_get_unsupported(self):
@@ -152,16 +152,16 @@ class TestArchiveProcessing(test.MATTest):
         for f in ('../mat.desktop', '../README.security', '../setup.py'):
             tar.add(f, f[3:])  # trim '../'
         tar.close()
-        current_file = MAT.mat.create_class_file(tarpath, False, add2archive=False)
+        current_file = libmat.mat.create_class_file(tarpath, False, add2archive=False)
         unsupported_files = set(current_file.is_clean(list_unsupported=True))
         self.assertEqual(unsupported_files, set(('mat.desktop', 'README.security', 'setup.py')))
 
     def test_archive_unwritable_content(self):
         path = os.path.join(self.tmpdir, './unwritable_content.zip')
         shutil.copy2('./unwritable_content.zip', self.tmpdir)
-        current_file = MAT.mat.create_class_file(path, False, add2archive=False)
+        current_file = libmat.mat.create_class_file(path, False, add2archive=False)
         current_file.remove_all()
-        current_file = MAT.mat.create_class_file(path, False, add2archive=False)
+        current_file = libmat.mat.create_class_file(path, False, add2archive=False)
         self.assertTrue(current_file.is_clean())
 
 def get_tests():