Rename data to session_data, as this API is per-session and not stored in the db

2 files changed, 12 insertions, 12 deletions

diff --git a/python/__init__.py b/python/__init__.py
index f5a46798..bfd2358f 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -243,7 +243,7 @@ class FileMetadata(object):
 			del cls._associated_data[handle.value]
 
 	@classmethod
-	def set_default_data(cls, name, value):
+	def set_default_session_data(cls, name, value):
 		_FileMetadataAssociatedDataStore.set_default(name, value)
 
 	@property
@@ -324,7 +324,7 @@ class FileMetadata(object):
 		self.nav = value
 
 	@property
-	def data(self):
+	def session_data(self):
 		"""Dictionary object where plugins can store arbitrary data associated with the file"""
 		handle = ctypes.cast(self.handle, ctypes.c_void_p)
 		if handle.value not in FileMetadata._associated_data:
@@ -1096,7 +1096,7 @@ class BinaryView(object):
 			del cls._associated_data[handle.value]
 
 	@classmethod
-	def set_default_data(cls, name, value):
+	def set_default_session_data(cls, name, value):
 		_BinaryViewAssociatedDataStore.set_default(name, value)
 
 	def __del__(self):
@@ -1311,7 +1311,7 @@ class BinaryView(object):
 		return result
 
 	@property
-	def data(self):
+	def session_data(self):
 		"""Dictionary object where plugins can store arbitrary data associated with the view"""
 		handle = ctypes.cast(self.handle, ctypes.c_void_p)
 		if handle.value not in BinaryView._associated_data:
@@ -4589,7 +4589,7 @@ class Function(object):
 			del cls._associated_data[handle.value]
 
 	@classmethod
-	def set_default_data(cls, name, value):
+	def set_default_session_data(cls, name, value):
 		_FunctionAssociatedDataStore.set_default(name, value)
 
 	@property
@@ -4717,7 +4717,7 @@ class Function(object):
 		return result
 
 	@property
-	def data(self):
+	def session_data(self):
 		"""Dictionary object where plugins can store arbitrary data associated with the function"""
 		handle = ctypes.cast(self.handle, ctypes.c_void_p)
 		if handle.value not in Function._associated_data:
diff --git a/python/examples/angr_plugin.py b/python/examples/angr_plugin.py
index 5d567511..c6e6f87d 100644
--- a/python/examples/angr_plugin.py
+++ b/python/examples/angr_plugin.py
@@ -21,8 +21,8 @@ import os
 logging.disable(logging.WARNING)
 
 # Create sets in the BinaryView's data field to store the desired path for each view
-BinaryView.set_default_data("angr_find", set())
-BinaryView.set_default_data("angr_avoid", set())
+BinaryView.set_default_session_data("angr_find", set())
+BinaryView.set_default_session_data("angr_avoid", set())
 
 def escaped_output(str):
 	return '\n'.join([s.encode("string_escape") for s in str.split('\n')])
@@ -89,7 +89,7 @@ def find_instr(bv, addr):
 		block.function.set_auto_instr_highlight(block.arch, addr, GreenHighlightColor)
 
 	# Add the instruction to the list associated with the current view
-	bv.data.angr_find.add(addr)
+	bv.session_data.angr_find.add(addr)
 
 def avoid_instr(bv, addr):
 	# Highlight the instruction in red
@@ -99,17 +99,17 @@ def avoid_instr(bv, addr):
 		block.function.set_auto_instr_highlight(block.arch, addr, RedHighlightColor)
 
 	# Add the instruction to the list associated with the current view
-	bv.data.angr_avoid.add(addr)
+	bv.session_data.angr_avoid.add(addr)
 
 def solve(bv):
-	if len(bv.data.angr_find) == 0:
+	if len(bv.session_data.angr_find) == 0:
 		show_message_box("Angr Solve", "You have not specified a goal instruction.\n\n" +
 			"Please right click on the goal instruction and select \"Find Path to This Instruction\" to " +
 			"continue.", OKButtonSet, ErrorIcon)
 		return
 
 	# Start a solver thread for the path associated with the view
-	s = Solver(bv.data.angr_find, bv.data.angr_avoid, bv)
+	s = Solver(bv.session_data.angr_find, bv.session_data.angr_avoid, bv)
 	s.start()
 
 # Register commands for the user to interact with the plugin