Clean Up 2/3 int/long Compatibility

5 files changed, 10 insertions, 15 deletions

diff --git a/python/__init__.py b/python/__init__.py
index 9dc774d3..bdc6bdd7 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -76,12 +76,6 @@ def with_metaclass(meta, *bases):
 	return type.__new__(metaclass, 'temporary_class', (), {})
 
 
-try:
-	long = long
-except NameError:
-	long = int
-
-
 def cstr(arg):
 	if isinstance(arg, bytes) or arg is None:
 		return arg
diff --git a/python/architecture.py b/python/architecture.py
index 1f1422cb..eabcbaa0 100644
--- a/python/architecture.py
+++ b/python/architecture.py
@@ -38,7 +38,8 @@ from binaryninja import callingconvention
 # 2-3 compatibility
 from binaryninja import range
 from binaryninja import with_metaclass
-from binaryninja import long
+import numbers
+
 
 class _ArchitectureMetaClass(type):
 
@@ -1575,7 +1576,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 		:return: the name of the semantic flag class
 		:rtype: str
 		"""
-		if not isinstance(class_index, (int, long)):
+		if not isinstance(class_index, numbers.Integral):
 			raise ValueError("argument 'class_index' must be an integer")
 		try:
 			return self._semantic_flag_classes_by_index[class_index]
@@ -1597,7 +1598,7 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 		:return: the name of the semantic flag group
 		:rtype: str
 		"""
-		if not isinstance(group_index, (int, long)):
+		if not isinstance(group_index, numbers.Integral):
 			raise ValueError("argument 'group_index' must be an integer")
 		try:
 			return self._semantic_flag_groups_by_index[group_index]
diff --git a/python/databuffer.py b/python/databuffer.py
index 8644a75e..d41799e7 100644
--- a/python/databuffer.py
+++ b/python/databuffer.py
@@ -25,14 +25,14 @@ from binaryninja import _binaryninjacore as core
 
 # 2-3 compatibility
 from binaryninja import pyNativeStr
-from binaryninja import long
+import numbers
 
 
 class DataBuffer(object):
 	def __init__(self, contents="", handle=None):
 		if handle is not None:
 			self.handle = core.handle_of_type(handle, core.BNDataBuffer)
-		elif isinstance(contents, int) or isinstance(contents, long):
+		elif isinstance(contents, int) or isinstance(contents, numbers.Integral):
 			self.handle = core.BNCreateDataBuffer(None, contents)
 		elif isinstance(contents, DataBuffer):
 			self.handle = core.BNDuplicateDataBuffer(contents.handle)
diff --git a/python/metadata.py b/python/metadata.py
index c4a72477..206927c0 100644
--- a/python/metadata.py
+++ b/python/metadata.py
@@ -21,7 +21,6 @@
 
 from __future__ import absolute_import
 import ctypes
-import numbers
 
 # Binary Ninja components
 from binaryninja import _binaryninjacore as core
@@ -30,6 +29,7 @@ from binaryninja.enums import MetadataType
 # 2-3 compatibility
 from binaryninja import range
 from binaryninja import pyNativeStr
+import numbers
 
 
 class Metadata(object):
diff --git a/python/transform.py b/python/transform.py
index da43a7fe..a441ef7b 100644
--- a/python/transform.py
+++ b/python/transform.py
@@ -30,7 +30,7 @@ from binaryninja import _binaryninjacore as core
 from binaryninja.enums import TransformType
 
 # 2-3 compatibility
-from binaryninja import long
+import numbers
 from binaryninja import range
 from binaryninja import with_metaclass
 
@@ -225,7 +225,7 @@ class Transform(with_metaclass(_TransformMetaClass, object)):
 		return None
 
 	def decode(self, input_buf, params = {}):
-		if isinstance(input_buf, int) or isinstance(input_buf, long):
+		if isinstance(input_buf, int) or isinstance(input_buf, numbers.Integral):
 			return None
 		input_buf = databuffer.DataBuffer(input_buf)
 		output_buf = databuffer.DataBuffer()
@@ -240,7 +240,7 @@ class Transform(with_metaclass(_TransformMetaClass, object)):
 		return str(output_buf)
 
 	def encode(self, input_buf, params = {}):
-		if isinstance(input_buf, int) or isinstance(input_buf, long):
+		if isinstance(input_buf, int) or isinstance(input_buf, numbers.Integral):
 			return None
 		input_buf = databuffer.DataBuffer(input_buf)
 		output_buf = databuffer.DataBuffer()