Merge pull request #990 from serpilliere/support_python2_python3

Support python2 python3

1 files changed, 11 insertions, 7 deletions

diff --git a/test/jitter/test_post_instr.py b/test/jitter/test_post_instr.py
index 0aff667e..52274a46 100644
--- a/test/jitter/test_post_instr.py
+++ b/test/jitter/test_post_instr.py
@@ -1,27 +1,31 @@
+from __future__ import print_function
 import sys
-from miasm2.analysis.machine import Machine
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE, EXCEPT_BREAKPOINT_MEMORY, EXCEPT_ACCESS_VIOL
+
+from miasm.core.utils import decode_hex
+from miasm.analysis.machine import Machine
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE, \
+    EXCEPT_BREAKPOINT_MEMORY, EXCEPT_ACCESS_VIOL
 
 machine = Machine("x86_32")
 jitter = machine.jitter(sys.argv[1])
 
 # Prepare stack and reset memory accesses to avoid an exception
-jitter.vm.add_memory_page(0x10000, PAGE_READ|PAGE_WRITE, "\x00"*0x1000, "stack")
-print jitter.vm
+jitter.vm.add_memory_page(0x10000, PAGE_READ|PAGE_WRITE, b"\x00"*0x1000, "stack")
+print(jitter.vm)
 
 jitter.cpu.ESP = 0x10000 + 0x1000
 jitter.push_uint32_t(0x0)
 jitter.push_uint32_t(0x1337beef)
 
 jitter.vm.reset_memory_access()
-print hex(jitter.vm.get_exception())
+print(hex(jitter.vm.get_exception()))
 
 # Add code, and keep memory write pending
-jitter.vm.add_memory_page(0x1000, PAGE_READ|PAGE_WRITE, "\x00"*0x1000, "code page")
+jitter.vm.add_memory_page(0x1000, PAGE_READ|PAGE_WRITE, b"\x00"*0x1000, "code page")
 
 # MOV EAX, 0x11223344
 # RET
-jitter.vm.set_mem(0x1000, "B844332211C3".decode('hex'))
+jitter.vm.set_mem(0x1000, decode_hex("B844332211C3"))
 
 
 jitter.set_trace_log()