Merge pull request #990 from serpilliere/support_python2_python3

Support python2 python3

1 files changed, 11 insertions, 7 deletions

diff --git a/test/analysis/data_flow.py b/test/analysis/data_flow.py
index 2d4e2275..ecca3eac 100644
--- a/test/analysis/data_flow.py
+++ b/test/analysis/data_flow.py
@@ -1,9 +1,13 @@
 """ Test cases for dead code elimination"""
-from miasm2.expression.expression import ExprId, ExprInt, ExprAssign, ExprMem
-from miasm2.core.locationdb import LocationDB
-from miasm2.analysis.data_flow import *
-from miasm2.ir.analysis import ira
-from miasm2.ir.ir import IRBlock, AssignBlock
+from __future__ import print_function
+
+from future.utils import viewitems
+
+from miasm.expression.expression import ExprId, ExprInt, ExprAssign, ExprMem
+from miasm.core.locationdb import LocationDB
+from miasm.analysis.data_flow import *
+from miasm.ir.analysis import ira
+from miasm.ir.ir import IRBlock, AssignBlock
 
 loc_db = LocationDB()
 
@@ -683,7 +687,7 @@ for test_nb, test in enumerate([(G1_IRA, G1_EXP_IRA),
     # Extract test elements
     g_ira, g_exp_ira = test
 
-    print "[+] Test", test_nb+1
+    print("[+] Test", test_nb+1)
 
     # Print initial graph, for debug
     open("graph_%02d.dot" % (test_nb+1), "w").write(g_ira.dot())
@@ -700,6 +704,6 @@ for test_nb, test in enumerate([(G1_IRA, G1_EXP_IRA),
     # Same number of blocks
     assert len(g_ira.blocks) == len(g_exp_ira.blocks)
     # Check that each expr in the blocks are the same
-    for lbl, irb in g_ira.blocks.iteritems():
+    for lbl, irb in viewitems(g_ira.blocks):
         exp_irb = g_exp_ira.blocks[lbl]
         assert exp_irb.assignblks == irb.assignblks