From 5cff3bf3cc5aa11875569a6aeddf88ef867411f1 Mon Sep 17 00:00:00 2001
From: KyleMiles <krm504@nyu.edu>
Date: Wed, 30 May 2018 15:41:10 -0400
Subject: Various Python 3 support changes

---
 python/architecture.py | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'python/architecture.py')

diff --git a/python/architecture.py b/python/architecture.py
index b99da184..521c750a 100644
--- a/python/architecture.py
+++ b/python/architecture.py
@@ -1073,7 +1073,6 @@ class Architecture(with_metaclass(_ArchitectureMetaClass, object)):
 			errors[0] = core.BNAllocString(str(error_str))
 			if data is None:
 				return False
-			data = str(data)
 			buf = ctypes.create_string_buffer(len(data))
 			ctypes.memmove(buf, data, len(data))
 			core.BNSetDataBufferContents(result, buf, len(data))
@@ -2294,7 +2293,6 @@ class CoreArchitecture(Architecture):
 		:rtype: InstructionInfo
 		"""
 		info = core.BNInstructionInfo()
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		if not core.BNGetInstructionInfo(self.handle, buf, addr, len(data), info):
@@ -2322,7 +2320,6 @@ class CoreArchitecture(Architecture):
 		:return: an InstructionTextToken list for the current instruction
 		:rtype: list(InstructionTextToken)
 		"""
-		data = str(data)
 		count = ctypes.c_ulonglong()
 		length = ctypes.c_ulonglong()
 		length.value = len(data)
@@ -2359,7 +2356,6 @@ class CoreArchitecture(Architecture):
 		:return: the length of the current instruction
 		:rtype: int
 		"""
-		data = str(data)
 		length = ctypes.c_ulonglong()
 		length.value = len(data)
 		buf = (ctypes.c_ubyte * len(data))()
@@ -2449,7 +2445,6 @@ class CoreArchitecture(Architecture):
 			False
 			>>>
 		"""
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		return core.BNIsArchitectureNeverBranchPatchAvailable(self.handle, buf, addr, len(data))
@@ -2471,7 +2466,6 @@ class CoreArchitecture(Architecture):
 			False
 			>>>
 		"""
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		return core.BNIsArchitectureAlwaysBranchPatchAvailable(self.handle, buf, addr, len(data))
@@ -2492,7 +2486,6 @@ class CoreArchitecture(Architecture):
 			False
 			>>>
 		"""
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		return core.BNIsArchitectureInvertBranchPatchAvailable(self.handle, buf, addr, len(data))
@@ -2516,7 +2509,6 @@ class CoreArchitecture(Architecture):
 			False
 			>>>
 		"""
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		return core.BNIsArchitectureSkipAndReturnZeroPatchAvailable(self.handle, buf, addr, len(data))
@@ -2538,7 +2530,6 @@ class CoreArchitecture(Architecture):
 			False
 			>>>
 		"""
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		return core.BNIsArchitectureSkipAndReturnValuePatchAvailable(self.handle, buf, addr, len(data))
@@ -2558,7 +2549,6 @@ class CoreArchitecture(Architecture):
 			'\\x90\\x90'
 			>>>
 		"""
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		if not core.BNArchitectureConvertToNop(self.handle, buf, addr, len(data)):
@@ -2585,7 +2575,6 @@ class CoreArchitecture(Architecture):
 			(['jmp     ', '0x9'], 5L)
 			>>>
 		"""
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		if not core.BNArchitectureAlwaysBranch(self.handle, buf, addr, len(data)):
@@ -2613,7 +2602,6 @@ class CoreArchitecture(Architecture):
 			(['jl      ', '0xa'], 6L)
 			>>>
 		"""
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		if not core.BNArchitectureInvertBranch(self.handle, buf, addr, len(data)):
@@ -2637,7 +2625,6 @@ class CoreArchitecture(Architecture):
 			(['mov     ', 'eax', ', ', '0x0'], 5L)
 			>>>
 		"""
-		data = str(data)
 		buf = (ctypes.c_ubyte * len(data))()
 		ctypes.memmove(buf, data, len(data))
 		if not core.BNArchitectureSkipAndReturnValue(self.handle, buf, addr, len(data), value):
-- 
cgit v1.3.1