Rename miasm2 to miasm

8 files changed, 19 insertions, 18 deletions

diff --git a/test/expression/expr_cmp.py b/test/expression/expr_cmp.py
index b238151d..671085f1 100644
--- a/test/expression/expr_cmp.py
+++ b/test/expression/expr_cmp.py
@@ -2,12 +2,12 @@
 # Expression comparison regression tests  #
 #
 from pdb import pm
-from miasm2.expression.expression import ExprInt, expr_is_unsigned_greater,\
+from miasm.expression.expression import ExprInt, expr_is_unsigned_greater,\
     expr_is_unsigned_greater_or_equal, expr_is_unsigned_lower,\
     expr_is_unsigned_lower_or_equal, expr_is_signed_greater,\
     expr_is_signed_greater_or_equal, expr_is_signed_lower, \
     expr_is_signed_lower_or_equal, expr_is_equal, expr_is_not_equal
-from miasm2.expression.simplifications import expr_simp
+from miasm.expression.simplifications import expr_simp
 
 int_0 = ExprInt(0, 32)
 int_1 = ExprInt(1, 32)
diff --git a/test/expression/expr_pickle.py b/test/expression/expr_pickle.py
index 16b87db7..70778d38 100644
--- a/test/expression/expr_pickle.py
+++ b/test/expression/expr_pickle.py
@@ -1,6 +1,6 @@
 from __future__ import print_function
 import pickle
-from miasm2.expression.expression import ExprInt, ExprAssign, ExprId, \
+from miasm.expression.expression import ExprInt, ExprAssign, ExprId, \
     Expr, ExprCompose, ExprMem
 
 
diff --git a/test/expression/expression.py b/test/expression/expression.py
index b8a2642a..3597eae8 100644
--- a/test/expression/expression.py
+++ b/test/expression/expression.py
@@ -3,8 +3,8 @@ from __future__ import print_function
 # Expression regression tests  #
 #
 from pdb import pm
-from miasm2.expression.expression import *
-from miasm2.expression.expression_helper import *
+from miasm.expression.expression import *
+from miasm.expression.expression_helper import *
 
 # Expression comparison
 assert(ExprInt(-1, 64) != ExprInt(-2, 64))
diff --git a/test/expression/expression_helper.py b/test/expression/expression_helper.py
index 6c6fb2a9..c188215e 100755
--- a/test/expression/expression_helper.py
+++ b/test/expression/expression_helper.py
@@ -10,8 +10,8 @@ import unittest
 class TestExpressionExpressionHelper(unittest.TestCase):
 
     def test_Variables_Identifier(self):
-        import miasm2.expression.expression as m2_expr
-        from miasm2.expression.expression_helper import Variables_Identifier
+        import miasm.expression.expression as m2_expr
+        from miasm.expression.expression_helper import Variables_Identifier
 
         # Build a complex expression
         cst = m2_expr.ExprInt(0x100, 16)
diff --git a/test/expression/modint.py b/test/expression/modint.py
index a833ee80..af80b284 100644
--- a/test/expression/modint.py
+++ b/test/expression/modint.py
@@ -1,5 +1,6 @@
 from __future__ import print_function
-from miasm2.expression.modint import *
+
+from miasm.expression.modint import *
 
 a = uint8(0x42)
 b = uint8(0xFF)
diff --git a/test/expression/parser.py b/test/expression/parser.py
index d05f8262..48c63753 100644
--- a/test/expression/parser.py
+++ b/test/expression/parser.py
@@ -1,6 +1,6 @@
 from __future__ import print_function
-from miasm2.expression.parser import str_to_expr
-from miasm2.expression.expression import ExprInt, ExprId, ExprSlice, ExprMem, \
+from miasm.expression.parser import str_to_expr
+from miasm.expression.expression import ExprInt, ExprId, ExprSlice, ExprMem, \
     ExprCond, ExprCompose, ExprOp, ExprAssign, ExprLoc, LocKey
 
 for expr_test in [ExprInt(0x12, 32),
diff --git a/test/expression/simplifications.py b/test/expression/simplifications.py
index ae9eb1c0..1a22c43d 100644
--- a/test/expression/simplifications.py
+++ b/test/expression/simplifications.py
@@ -6,11 +6,11 @@ from pdb import pm
 from argparse import ArgumentParser
 import logging
 
-from miasm2.expression.expression import *
-from miasm2.expression.simplifications import expr_simp, expr_simp_explicit, \
+from miasm.expression.expression import *
+from miasm.expression.simplifications import expr_simp, expr_simp_explicit, \
     ExpressionSimplifier, log_exprsimp
 
-from miasm2.expression.simplifications_cond import ExprOp_inf_signed, ExprOp_inf_unsigned, ExprOp_equal
+from miasm.expression.simplifications_cond import ExprOp_inf_signed, ExprOp_inf_unsigned, ExprOp_equal
 
 parser = ArgumentParser("Expression simplification regression tests")
 parser.add_argument("--z3", action="store_true", help="Enable check against z3")
@@ -24,7 +24,7 @@ if args.verbose:
 # Additional imports and definitions
 if args.z3:
     import z3
-    from miasm2.ir.translators import Translator
+    from miasm.ir.translators import Translator
     trans = Translator.to_language("z3")
 
     def check(expr_in, expr_out):
diff --git a/test/expression/stp.py b/test/expression/stp.py
index 7650bf45..b97b0754 100755
--- a/test/expression/stp.py
+++ b/test/expression/stp.py
@@ -8,8 +8,8 @@ import unittest
 class TestIrIr2STP(unittest.TestCase):
 
     def test_ExprOp_strcst(self):
-        from miasm2.expression.expression import ExprInt, ExprOp
-        from miasm2.ir.translators.translator  import Translator
+        from miasm.expression.expression import ExprInt, ExprOp
+        from miasm.ir.translators.translator  import Translator
         translator_smt2 = Translator.to_language("smt2")
 
         args = [ExprInt(i, 32) for i in range(9)]
@@ -23,8 +23,8 @@ class TestIrIr2STP(unittest.TestCase):
         self.assertRaises(NotImplementedError, translator_smt2.from_expr, ExprOp('X', *args[:1]))
 
     def test_ExprSlice_strcst(self):
-        from miasm2.expression.expression import ExprInt, ExprOp
-        from miasm2.ir.translators.translator  import Translator
+        from miasm.expression.expression import ExprInt, ExprOp
+        from miasm.ir.translators.translator  import Translator
         translator_smt2 = Translator.to_language("smt2")
 
         args = [ExprInt(i, 32) for i in range(9)]