From 1d735e49d20c0484a442caf01798fcc218b28498 Mon Sep 17 00:00:00 2001 From: anthony cantor Date: Mon, 2 Sep 2013 21:45:34 -0600 Subject: [PATCH] fix python2/3 incompatibility bytes built-in is different in python2 --- llvm/mc/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/llvm/mc/__init__.py b/llvm/mc/__init__.py index 46d9276..63e8d65 100644 --- a/llvm/mc/__init__.py +++ b/llvm/mc/__init__.py @@ -1,3 +1,5 @@ +import sys + import llvm if llvm.version < (3, 4): raise Exception("mc is not supported for llvm version less than 3.4") @@ -129,8 +131,11 @@ class Disassembler(object): @bs) ''' - if isinstance(bs, str): - bs = bytes(map(lambda c: ord(c), bs)) + if not isinstance(bs, bytes): + if sys.version_info.major < 3: + bs = bytes(bs) + else: + bs = bytes(map(lambda c: ord(c), bs)) code = api.llvm.StringRefMemoryObject.new(bs, base_addr) idx = 0