addition 3 compatibility changes

1 files changed, 13 insertions, 10 deletions

diff --git a/python/types.py b/python/types.py
index adb9e03a..857f67e6 100644
--- a/python/types.py
+++ b/python/types.py
@@ -28,6 +28,9 @@ import binaryninja
 from binaryninja import _binaryninjacore as core
 from binaryninja.enums import SymbolType, TypeClass, NamedTypeReferenceClass, InstructionTextTokenType, StructureType, ReferenceType, VariableSourceType
 
+#2-3 compatibility
+from six.moves import range
+
 
 class QualifiedName(object):
 	def __init__(self, name = []):
@@ -98,7 +101,7 @@ class QualifiedName(object):
 	def _get_core_struct(self):
 		result = core.BNQualifiedName()
 		name_list = (ctypes.c_char_p * len(self.name))()
-		for i in xrange(0, len(self.name)):
+		for i in range(0, len(self.name)):
 			name_list[i] = self.name[i]
 		result.name = name_list
 		result.nameCount = len(self.name)
@@ -107,7 +110,7 @@ class QualifiedName(object):
 	@classmethod
 	def _from_core_struct(cls, name):
 		result = []
-		for i in xrange(0, name.nameCount):
+		for i in range(0, name.nameCount):
 			result.append(name.name[i])
 		return QualifiedName(result)
 
@@ -300,7 +303,7 @@ class Type(object):
 		count = ctypes.c_ulonglong()
 		params = core.BNGetTypeParameters(self.handle, count)
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			param_type = Type(core.BNNewTypeReference(params[i].type), platform = self.platform, confidence = params[i].typeConfidence)
 			if params[i].defaultLocation:
 				param_location = None
@@ -403,7 +406,7 @@ class Type(object):
 			platform = self.platform.handle
 		tokens = core.BNGetTypeTokens(self.handle, platform, base_confidence, count)
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			token_type = InstructionTextTokenType(tokens[i].type)
 			text = tokens[i].text
 			value = tokens[i].value
@@ -423,7 +426,7 @@ class Type(object):
 			platform = self.platform.handle
 		tokens = core.BNGetTypeTokensBeforeName(self.handle, platform, base_confidence, count)
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			token_type = InstructionTextTokenType(tokens[i].type)
 			text = tokens[i].text
 			value = tokens[i].value
@@ -443,7 +446,7 @@ class Type(object):
 			platform = self.platform.handle
 		tokens = core.BNGetTypeTokensAfterName(self.handle, platform, base_confidence, count)
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			token_type = InstructionTextTokenType(tokens[i].type)
 			text = tokens[i].text
 			value = tokens[i].value
@@ -574,7 +577,7 @@ class Type(object):
 		:param bool variable_arguments: optional argument for functions that have a variable number of arguments
 		"""
 		param_buf = (core.BNFunctionParameter * len(params))()
-		for i in xrange(0, len(params)):
+		for i in range(0, len(params)):
 			if isinstance(params[i], Type):
 				param_buf[i].name = ""
 				param_buf[i].type = params[i].handle
@@ -851,7 +854,7 @@ class Structure(object):
 		count = ctypes.c_ulonglong()
 		members = core.BNGetStructureMembers(self.handle, count)
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			result.append(StructureMember(Type(core.BNNewTypeReference(members[i].type), confidence = members[i].typeConfidence),
 				members[i].name, members[i].offset))
 		core.BNFreeStructureMemberList(members, count.value)
@@ -962,7 +965,7 @@ class Enumeration(object):
 		count = ctypes.c_ulonglong()
 		members = core.BNGetEnumerationMembers(self.handle, count)
 		result = []
-		for i in xrange(0, count.value):
+		for i in range(0, count.value):
 			result.append(EnumerationMember(members[i].name, members[i].value, members[i].isDefault))
 		core.BNFreeEnumerationMemberList(members, count.value)
 		return result
@@ -1018,7 +1021,7 @@ def preprocess_source(source, filename=None, include_dirs=[]):
 	if filename is None:
 		filename = "input"
 	dir_buf = (ctypes.c_char_p * len(include_dirs))()
-	for i in xrange(0, len(include_dirs)):
+	for i in range(0, len(include_dirs)):
 		dir_buf[i] = str(include_dirs[i])
 	output = ctypes.c_char_p()
 	errors = ctypes.c_char_p()