commit 749046bbdcab5a28462be57fa49323a2c65637e7
author Nguyen Anh Quynh <aquynh@gmail.com> Sat Apr 12 01:15:10 2014 +0800
committer Nguyen Anh Quynh <aquynh@gmail.com> Sat Apr 12 01:15:10 2014 +0800
tree 07c52ec1cef40312a254b17601fdd009f89abb6c
parent 943cb2d71b826084910ca44b39fc8fcc9788d742
parent 110ab1debd68b9d95e4ca5b39a4eda4ab92c8165

python: initial Python3 support

bindings/python/test_skipdata.py

diff --git a/bindings/python/test_skipdata.py b/bindings/python/test_skipdata.py
index 3e6c2b1..9f23678 100755
--- a/bindings/python/test_skipdata.py
+++ b/bindings/python/test_skipdata.py
@@ -2,31 +2,30 @@
 
 # Capstone Python bindings, by Nguyen Anh Quynnh <aquynh@gmail.com>
 
+from __future__ import print_function
 from capstone import *
 import binascii
 
-X86_CODE32 = "\x8d\x4c\x32\x08\x01\xd8\x81\xc6\x34\x12\x00\x00\x00\x91\x92"
-RANDOM_CODE = "\xed\x00\x00\x00\x00\x1a\x5a\x0f\x1f\xff\xc2\x09\x80\x00\x00\x00\x07\xf7\xeb\x2a\xff\xff\x7f\x57\xe3\x01\xff\xff\x7f\x57\xeb\x00\xf0\x00\x00\x24\xb2\x4f\x00\x78"
+from test import to_x, to_hex, to_x_32
+
+X86_CODE32 = b"\x8d\x4c\x32\x08\x01\xd8\x81\xc6\x34\x12\x00\x00\x00\x91\x92"
+RANDOM_CODE = b"\xed\x00\x00\x00\x00\x1a\x5a\x0f\x1f\xff\xc2\x09\x80\x00\x00\x00\x07\xf7\xeb\x2a\xff\xff\x7f\x57\xe3\x01\xff\xff\x7f\x57\xeb\x00\xf0\x00\x00\x24\xb2\x4f\x00\x78"
 
 all_tests = (
         (CS_ARCH_X86, CS_MODE_32, X86_CODE32, "X86 32 (Intel syntax)", 0),
         (CS_ARCH_ARM, CS_MODE_ARM, RANDOM_CODE, "Arm", 0),
-        )
+)
 
 
-def to_hex(s):
-    return " ".join("0x" + "{0:x}".format(ord(c)).zfill(2) for c in s) # <-- Python 3 is OK
-
-
-### Test cs_disasm_quick()
+# ## Test cs_disasm_quick()
 def test_cs_disasm_quick():
     for (arch, mode, code, comment, syntax) in all_tests:
         print('*' * 40)
-        print("Platform: %s" %comment)
+        print("Platform: %s" % comment)
         print("Disasm:"),
-        print to_hex(code)
+        print(to_hex(code))
         for insn in cs_disasm_quick(arch, mode, code, 0x1000):
-            print("0x%x:\t%s\t%s" %(insn.address, insn.mnemonic, insn.op_str))
+            print("0x%x:\t%s\t%s" % (insn.address, insn.mnemonic, insn.op_str))
         print
 
 
@@ -36,7 +35,7 @@
     return 2
 
 
-### Test class Cs
+# ## Test class Cs
 def test_class():
     for (arch, mode, code, comment, syntax) in all_tests:
         print('*' * 16)
@@ -63,12 +62,13 @@
             for insn in md.disasm(code, 0x1000):
                 #bytes = binascii.hexlify(insn.bytes)
                 #print("0x%x:\t%s\t%s\t// hex-code: %s" %(insn.address, insn.mnemonic, insn.op_str, bytes))
-                print("0x%x:\t%s\t%s" %(insn.address, insn.mnemonic, insn.op_str))
+                print("0x%x:\t%s\t%s" % (insn.address, insn.mnemonic, insn.op_str))
 
             print("0x%x:" % (insn.address + insn.size))
             print
         except CsError as e:
-            print("ERROR: %s" %e)
+            print("ERROR: %s" % e)
 
 
-test_class()
+if __name__ == '__main__':
+    test_class()