Merge in pull requests that never made it into dev

1 files changed, 14 insertions, 0 deletions

diff --git a/python/types.py b/python/types.py
index 8582e4e0..62a441cd 100644
--- a/python/types.py
+++ b/python/types.py
@@ -237,6 +237,12 @@ class Type(object):
 
 	@classmethod
 	def int(self, width, sign = True, altname=""):
+		"""
+		``int`` class method for creating an int Type.
+
+		:param int width: width of the integer in bytes
+		:param bool sign: optional variable representing signedness
+		"""
 		return Type(core.BNCreateIntegerType(width, sign, altname))
 
 	@classmethod
@@ -267,6 +273,14 @@ class Type(object):
 
 	@classmethod
 	def function(self, ret, params, calling_convention=None, variable_arguments=False):
+		"""
+		``function`` class method for creating an function Type.
+
+		:param Type ret: width of the integer in bytes
+		:param list(Type) params: list of parameter Types
+		:param CallingConvention calling_convention: optional argument for function calling convention
+		:param bool variable_arguments: optional argument for functions that have a variable number of arguments
+		"""
 		param_buf = (core.BNNameAndType * len(params))()
 		for i in xrange(0, len(params)):
 			if isinstance(params[i], Type):