14 files changed, 21 insertions, 15 deletions

diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/__init__.py
diff --git a/cli.py b/cli.py
index bd87409..0ba7531 100755
--- a/cli.py
+++ b/cli.py
@@ -4,7 +4,7 @@
 '''
 
 import sys
-import mat
+import lib.mat
 import optparse
 
 __version__ = '0.1'
diff --git a/hachoir_editor/__init__.pyc b/hachoir_editor/__init__.pyc
deleted file mode 100644
index 23f4a8e..0000000
--- a/hachoir_editor/__init__.pyc
+++ /dev/null
diff --git a/hachoir_editor/field.pyc b/hachoir_editor/field.pyc
deleted file mode 100644
index ff7b91d..0000000
--- a/hachoir_editor/field.pyc
+++ /dev/null
diff --git a/hachoir_editor/fieldset.pyc b/hachoir_editor/fieldset.pyc
deleted file mode 100644
index f4e37fa..0000000
--- a/hachoir_editor/fieldset.pyc
+++ /dev/null
diff --git a/hachoir_editor/typed_field.pyc b/hachoir_editor/typed_field.pyc
deleted file mode 100644
index 3d442ed..0000000
--- a/hachoir_editor/typed_field.pyc
+++ /dev/null
diff --git a/lib/__init__.py b/lib/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/__init__.py
diff --git a/mat.py b/lib/mat.py
index 200fc04..48b83fb 100755
--- a/mat.py
+++ b/lib/mat.py
@@ -3,18 +3,19 @@
 '''
     Metadata anonymisation toolkit library
 '''
+import sys
+import os
 
 import hachoir_core.error
 import hachoir_core.field
 import hachoir_core.cmd_line
 import hachoir_parser
 import hachoir_metadata
-import hachoir_editor
-
-import sys
-import os
 import hachoir_parser.image
 
+sys.path.append('..')
+import hachoir_editor
+
 __version__ = "0.1"
 __author__ = "jvoisin"
 
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/__init__.py
diff --git a/clean.jpg b/test/clean.jpg
index 09c9161..09c9161 100644
--- a/clean.jpg
+++ b/test/clean.jpg
diff --git a/clitest.py b/test/clitest.py
index edd0ddb..da0563f 100755
--- a/clitest.py
+++ b/test/clitest.py
@@ -5,23 +5,24 @@
 
 import unittest
 import subprocess
-
+import sys
+sys.path.append('..')
 import cli
-import mat
+from lib import mat
 import test
 
 class Test_Remove_cli(test.MATTest):
     def test_remove(self):
         '''make sure that the cli remove all compromizing meta'''
         for clean, dirty in self.file_list:
-            subprocess.call(['./cli.py', dirty])
+            subprocess.call(['../cli.py', dirty])
             current_file = mat.create_class_file(dirty)
             self.assertTrue(current_file.is_clean())
 
     def test_remove_empty(self):
         '''Test removal with clean files'''
         for clean, dirty in self.file_list:
-            subprocess.call(['./cli.py', clean])
+            subprocess.call(['../cli.py', clean])
             current_file = mat.create_class_file(clean)
             self.assertTrue(current_file.is_clean())
 
@@ -31,7 +32,7 @@ class Test_List_cli(test.MATTest):
         '''check if get_meta returns meta'''
         for clean, dirty in self.file_list:
             #fixme : a (clean|dirty).(jpg|pdf|...).out ?
-            proc = subprocess.Popen(['./cli.py', '-d', clean],
+            proc = subprocess.Popen(['../cli.py', '-d', clean],
                 stdout=subprocess.PIPE)
             stdout, stderr = proc.communicate()
             self.assertEqual(stdout, "[+] File %s" % clean)
@@ -39,7 +40,7 @@ class Test_List_cli(test.MATTest):
     def test_list_dirty(self):
         '''check if get_meta returns all the expected meta'''
         for clean, dirty in self.file_list:
-            proc = subprocess.Popen(['./cli.py', '-d', dirty],
+            proc = subprocess.Popen(['../cli.py', '-d', dirty],
                 stdout=subprocess.PIPE)
             stdout, stderr = proc.communicate()
             self.assertNotEqual(stdout, "[+] File %s" % dirty)
@@ -50,7 +51,7 @@ class Test_isClean_cli(test.MATTest):
     def test_clean(self):
         '''test is_clean on clean files'''
         for clean, dirty in self.file_list:
-            proc = subprocess.Popen(['./cli.py', '-c', clean],
+            proc = subprocess.Popen(['../cli.py', '-c', clean],
                 stdout=subprocess.PIPE)
             stdout, stderr = proc.communicate()
             self.assertEqual(stdout.strip('\n'), '[+] %s is clean' % clean)
@@ -58,7 +59,7 @@ class Test_isClean_cli(test.MATTest):
     def test_dirty(self):
         '''test is_clean on dirty files'''
         for clean, dirty in self.file_list:
-            proc = subprocess.Popen(['./cli.py', '-c', dirty],
+            proc = subprocess.Popen(['../cli.py', '-c', dirty],
                 stdout=subprocess.PIPE)
             stdout, stderr = proc.communicate()
             self.assertEqual(stdout.strip('\n'), '[+] %s is not clean' % dirty)
diff --git a/dirty.jpg b/test/dirty.jpg
index 09c9161..09c9161 100644
--- a/dirty.jpg
+++ b/test/dirty.jpg
diff --git a/libtest.py b/test/libtest.py
index 58cc618..2bd1fa7 100755
--- a/libtest.py
+++ b/test/libtest.py
@@ -4,9 +4,11 @@
     Unit test for the library
 '''
 
-import mat
 import unittest
 import test
+import sys
+sys.path.append('..')
+from lib import mat
 
 class Test_Remove_lib(test.MATTest):
     def test_remove(self):
diff --git a/test.py b/test/test.py
index 3138be7..f095157 100755
--- a/test.py
+++ b/test/test.py
@@ -7,9 +7,11 @@
 
 import shutil
 import glob
+import sys
 import tempfile
 import unittest
-import mat
+sys.path.append('..')
+from lib import mat
 
 FILE_LIST = zip(glob.glob('clean*'), glob.glob('dirty*'))