Merge pull request #990 from serpilliere/support_python2_python3

Support python2 python3

1 files changed, 8 insertions, 5 deletions

diff --git a/test/ir/ir.py b/test/ir/ir.py
index 072c90f6..a959a7a7 100644
--- a/test/ir/ir.py
+++ b/test/ir/ir.py
@@ -1,6 +1,8 @@
-from miasm2.expression.expression import *
-from miasm2.ir.ir import AssignBlock
-from miasm2.expression.simplifications import expr_simp
+from future.utils import viewitems
+
+from miasm.expression.expression import *
+from miasm.ir.ir import AssignBlock
+from miasm.expression.simplifications import expr_simp
 
 id_a = ExprId("a", 32)
 id_b = ExprId("b", 32)
@@ -34,10 +36,11 @@ else:
 assert assignblk1.get_r() == set([id_b])
 assert assignblk1.get_w() == set([id_a])
 assert assignblk1.get_rw() == {id_a: set([id_b])}
-assert assignblk1.keys() == [id_a]
+assert list(assignblk1) == [id_a]
 assert dict(assignblk1) == {id_a: id_b}
 assert assignblk1[id_a] == id_b
-assert list(assignblk1.iteritems()) == assignblk1.items()
+assert list(viewitems(assignblk1)) == list(viewitems(assignblk1))
+assert set(assignblk1.iteritems()) == set(assignblk1.items())
 
 ## Simplify
 assignblk3 = AssignBlock({id_a: id_b - id_b})