BGE Python API cleanup - no functionality changes

- comments to PyObjectPlus.h
- remove unused/commented junk.
- renamed PyDestructor to py_base_dealloc for consistency
- all the PyTypeObject's were still using the sizeof() their class, can use sizeof(PyObjectPlus_Proxy) now which is smaller too.

63 files changed, 200 insertions, 247 deletions

diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index 960eafda230..530a74dfb12 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -968,9 +968,9 @@ PyTypeObject BL_ActionActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"BL_ActionActuator",
-		sizeof(BL_ActionActuator),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index 0d35b26d604..783fdd814b7 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -423,9 +423,9 @@ PyTypeObject BL_ShapeActionActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"BL_ShapeActionActuator",
-		sizeof(BL_ShapeActionActuator),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp
index eaed2b5c400..5bb1eb0aeb9 100644
--- a/source/gameengine/Expressions/ListValue.cpp
+++ b/source/gameengine/Expressions/ListValue.cpp
@@ -223,10 +223,10 @@ PyTypeObject CListValue::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/*ob_size*/
 	"CListValue",			/*tp_name*/
-	sizeof(CListValue),		/*tp_basicsize*/
+	sizeof(PyObjectPlus_Proxy), /*tp_basicsize*/
 	0,				/*tp_itemsize*/
 	/* methods */
-	PyDestructor,	  		/*tp_dealloc*/
+	py_base_dealloc,	  		/*tp_dealloc*/
 	0,			 	/*tp_print*/
 	0, 			/*tp_getattr*/
 	0, 			/*tp_setattr*/
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index 2c5ba3f39fc..3c414c6b16d 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -59,10 +59,10 @@ PyTypeObject PyObjectPlus::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/*ob_size*/
 	"PyObjectPlus",			/*tp_name*/
-	sizeof(PyObjectPlus),		/*tp_basicsize*/
+	sizeof(PyObjectPlus_Proxy),		/*tp_basicsize*/
 	0,				/*tp_itemsize*/
 	/* methods */
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
@@ -85,7 +85,7 @@ PyObjectPlus::~PyObjectPlus()
 //	assert(ob_refcnt==0);
 }
 
-void PyObjectPlus::PyDestructor(PyObject *self)				// python wrapper
+void PyObjectPlus::py_base_dealloc(PyObject *self)				// python wrapper
 {
 	PyObjectPlus *self_plus= BGE_PROXY_REF(self);
 	if(self_plus) {
@@ -108,7 +108,7 @@ PyObjectPlus::PyObjectPlus(PyTypeObject *T) 				// constructor
  * PyObjectPlus Methods 	-- Every class, even the abstract one should have a Methods
 ------------------------------*/
 PyMethodDef PyObjectPlus::Methods[] = {
-  {"isA",		 (PyCFunction) sPy_isA,			METH_O},
+  {"isA",		 (PyCFunction) sPyisA,			METH_O},
   {NULL, NULL}		/* Sentinel */
 };
 
@@ -130,6 +130,49 @@ PyParentObject PyObjectPlus::Parents[] = {&PyObjectPlus::Type, NULL};
 /*------------------------------
  * PyObjectPlus attributes	-- attributes
 ------------------------------*/
+
+
+/* This should be the entry in Type since it takes the C++ class from PyObjectPlus_Proxy */
+PyObject *PyObjectPlus::py_base_getattro(PyObject * self, PyObject *attr)
+{
+	PyObjectPlus *self_plus= BGE_PROXY_REF(self);
+	if(self_plus==NULL) {
+		if(!strcmp("isValid", PyString_AsString(attr))) {
+			Py_RETURN_TRUE;
+		}
+		PyErr_SetString(PyExc_RuntimeError, BGE_PROXY_ERROR_MSG);
+		return NULL;
+	}
+	return self_plus->py_getattro(attr); 
+}
+
+/* This should be the entry in Type since it takes the C++ class from PyObjectPlus_Proxy */
+int PyObjectPlus::py_base_setattro(PyObject *self, PyObject *attr, PyObject *value)
+{
+	PyObjectPlus *self_plus= BGE_PROXY_REF(self);
+	if(self_plus==NULL) {
+		PyErr_SetString(PyExc_RuntimeError, BGE_PROXY_ERROR_MSG);
+		return -1;
+	}
+	
+	if (value==NULL)
+		return self_plus->py_delattro(attr);
+	
+	return self_plus->py_setattro(attr, value); 
+}
+
+PyObject *PyObjectPlus::py_base_repr(PyObject *self)			// This should be the entry in Type.
+{
+	
+	PyObjectPlus *self_plus= BGE_PROXY_REF(self);
+	if(self_plus==NULL) {
+		PyErr_SetString(PyExc_RuntimeError, BGE_PROXY_ERROR_MSG);
+		return NULL;
+	}
+	
+	return self_plus->py_repr();  
+}
+
 PyObject *PyObjectPlus::py_getattro(PyObject* attr)
 {
 	PyObject *descr = PyDict_GetItem(Type.tp_dict, attr); \
@@ -151,8 +194,6 @@ PyObject *PyObjectPlus::py_getattro(PyObject* attr)
 		}
 		/* end py_getattro_up copy */
 	}
-  //if (streq(attr, "type"))
-  //  return Py_BuildValue("s", (*(GetParents()))->tp_name);
 }
 
 int PyObjectPlus::py_delattro(PyObject* attr)
@@ -163,8 +204,6 @@ int PyObjectPlus::py_delattro(PyObject* attr)
 
 int PyObjectPlus::py_setattro(PyObject *attr, PyObject* value)
 {
-	//return PyObject::py_setattro(attr,value);
-	//cerr << "Unknown attribute" << endl;
 	PyErr_SetString(PyExc_AttributeError, "attribute cant be set");
 	return PY_SET_ATTR_MISSING;
 }
@@ -275,20 +314,6 @@ PyObject *PyObjectPlus::py_get_attrdef(void *self, const PyAttributeDef *attrdef
 	}
 }
 
-#if 0
-PyObject *PyObjectPlus::py_getattro_self(const PyAttributeDef attrlist[], void *self, PyObject *attr)
-{
-	char *attr_str= PyString_AsString(attr);
-	const PyAttributeDef *attrdef;
-	
-	for (attrdef=attrlist; attrdef->m_name != NULL; attrdef++)
-		if (!strcmp(attr_str, attrdef->m_name))
-			return py_get_attrdef(self, attrdef);
-	
-	return NULL;
-}
-#endif
-
 int PyObjectPlus::py_set_attrdef(void *self, const PyAttributeDef *attrdef, PyObject *value)
 {
 	void *undoBuffer = NULL;
@@ -714,29 +739,7 @@ int PyObjectPlus::py_set_attrdef(void *self, const PyAttributeDef *attrdef, PyOb
 	return 0;	
 }
 
-#if 0
-int PyObjectPlus::py_setattro_self(const PyAttributeDef attrlist[], void *self, PyObject *attr, PyObject *value)
-{
-	const PyAttributeDef *attrdef;
-	char *attr_str= PyString_AsString(attr);
 
-	for (attrdef=attrlist; attrdef->m_name != NULL; attrdef++)
-	{
-		if (!strcmp(attr_str, attrdef->m_name))
-		{
-			if (attrdef->m_access == KX_PYATTRIBUTE_RO ||
-				attrdef->m_type == KX_PYATTRIBUTE_TYPE_DUMMY)
-			{
-				PyErr_SetString(PyExc_AttributeError, "property is read-only");
-				return PY_SET_ATTR_FAIL;
-			}
-			
-			return py_set_attrdef(self, attrdef, value);
-		}
-	}
-	return PY_SET_ATTR_MISSING;			
-}
-#endif
 
 /*------------------------------
  * PyObjectPlus repr		-- representations
@@ -777,7 +780,7 @@ bool PyObjectPlus::isA(const char *mytypename)		// check typename of each parent
 	return false;
 }
 
-PyObject *PyObjectPlus::Py_isA(PyObject *value)		// Python wrapper for isA
+PyObject *PyObjectPlus::PyisA(PyObject *self, PyObject *value)		// Python wrapper for isA
 {
 	if (PyType_Check(value)) {
 		return PyBool_FromLong(isA((PyTypeObject *)value));
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index 3be9a2f2bcb..9f30e6570ee 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -50,13 +50,13 @@
    also in api2_2x/gen_utils.h 
 */
 #ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE  return Py_BuildValue("O", Py_None)
+#define Py_RETURN_NONE  return Py_INCREF(Py_None), Py_None
 #endif
 #ifndef Py_RETURN_FALSE
-#define Py_RETURN_FALSE  return PyBool_FromLong(0)
+#define Py_RETURN_FALSE  return Py_INCREF(Py_False), Py_False
 #endif
 #ifndef Py_RETURN_TRUE
-#define Py_RETURN_TRUE  return PyBool_FromLong(1)
+#define Py_RETURN_TRUE  return Py_INCREF(Py_True), Py_True
 #endif
 
 /*  for pre Py 2.5 */
@@ -92,7 +92,7 @@ typedef struct {
 #define BGE_PROXY_PYOWNS(_self) (((PyObjectPlus_Proxy *)_self)->py_owns)
 
 /* Note, sometimes we dont care what BGE type this is as long as its a proxy */
-#define BGE_PROXY_CHECK_TYPE(_self) ((_self)->ob_type->tp_dealloc == PyDestructor)
+#define BGE_PROXY_CHECK_TYPE(_self) ((_self)->ob_type->tp_dealloc == py_base_dealloc)
 
 
 								// This must be the first line of each 
@@ -429,80 +429,34 @@ public:
 	PyObject *m_proxy; /* actually a PyObjectPlus_Proxy */
 	
 	virtual ~PyObjectPlus();					// destructor
-	static void PyDestructor(PyObject *self);				// python wrapper
 	
-//	void INCREF(void) {
-//		  Py_INCREF(this);
-//	  };				// incref method
-//	void DECREF(void) {
-//		  Py_DECREF(this);
-//	  };				// decref method
+	/* These static functions are referenced by ALL PyObjectPlus_Proxy types
+	 * they take the C++ reference from the PyObjectPlus_Proxy and call
+	 * its own virtual py_getattro, py_setattro etc. functions.
+	 */
+	static void			py_base_dealloc(PyObject *self);
+	static  PyObject*		py_base_getattro(PyObject * self, PyObject *attr);
+	static  int			py_base_setattro(PyObject *self, PyObject *attr, PyObject *value);
+	static PyObject*		py_base_repr(PyObject *self);
+
+	/* These are all virtual python methods that are defined in each class
+	 * Our own fake subclassing calls these on each class, then calls the parent */
+	virtual PyObject*		py_getattro(PyObject *attr);
+	virtual int			py_delattro(PyObject *attr);
+	virtual int			py_setattro(PyObject *attr, PyObject *value);
+	virtual PyObject*		py_repr(void);
+
+	static PyObject*		py_get_attrdef(void *self, const PyAttributeDef *attrdef);
+	static int				py_set_attrdef(void *self, const PyAttributeDef *attrdef, PyObject *value);
 	
-	virtual PyObject *py_getattro(PyObject *attr);			// py_getattro method
-	static  PyObject *py_base_getattro(PyObject * self, PyObject *attr) 	// This should be the entry in Type. 
-	{
-		PyObjectPlus *self_plus= BGE_PROXY_REF(self);
-		if(self_plus==NULL) {
-			if(!strcmp("isValid", PyString_AsString(attr))) {
-				Py_RETURN_TRUE;
-			}
-			PyErr_SetString(PyExc_RuntimeError, "data has been removed");
-			return NULL;
-		}
-		return self_plus->py_getattro(attr); 
-	}
-	
-	static PyObject*	py_get_attrdef(void *self, const PyAttributeDef *attrdef);
-	static int			py_set_attrdef(void *self, const PyAttributeDef *attrdef, PyObject *value);
-	
-#if 0
-	static PyObject *py_getattro_self(const PyAttributeDef attrlist[], void *self, PyObject *attr);
-	static int py_setattro_self(const PyAttributeDef attrlist[], void *self, PyObject *attr, PyObject *value);
-#endif
-	
-	virtual int py_delattro(PyObject *attr);
-	virtual int py_setattro(PyObject *attr, PyObject *value);		// py_setattro method
-	static  int py_base_setattro(PyObject *self, PyObject *attr, PyObject *value) // the PyType should reference this
-	{
-		PyObjectPlus *self_plus= BGE_PROXY_REF(self);
-		if(self_plus==NULL) {
-			PyErr_SetString(PyExc_RuntimeError, "data has been removed");
-			return -1;
-		}
-		
-		if (value==NULL)
-			return self_plus->py_delattro(attr);
-		
-		return self_plus->py_setattro(attr, value); 
-	}
-	
-	virtual PyObject *py_repr(void);				// py_repr method
-	static  PyObject *py_base_repr(PyObject *self)			// This should be the entry in Type.
-	{
-		
-		PyObjectPlus *self_plus= BGE_PROXY_REF(self);
-		if(self_plus==NULL) {
-			PyErr_SetString(PyExc_RuntimeError, "data has been removed");
-			return NULL;
-		}
-		
-		return self_plus->py_repr();  
-	}
-	
-									// isA methods
+	/* isA() methods, shonky replacement for pythons issubclass()
+	 * which we cant use because we have our own subclass system  */
 	bool isA(PyTypeObject *T);
 	bool isA(const char *mytypename);
-	PyObject *Py_isA(PyObject *value);
-	static PyObject *sPy_isA(PyObject *self, PyObject *value)
-	{
-		PyObjectPlus *self_plus= BGE_PROXY_REF(self);
-		if(self_plus==NULL) {
-			PyErr_SetString(PyExc_RuntimeError, "data has been removed");
-			return NULL;
-		}
-		
-		return self_plus->Py_isA(value);
-	}
+	PyObject *PyisA(PyObject *value);
+	//static PyObject *sPy_isA(PyObject *self, PyObject *value);
+	
+	KX_PYMETHOD_O(PyObjectPlus,isA);
 	
 	/* Kindof dumb, always returns True, the false case is checked for, before this function gets accessed */
 	static PyObject*	pyattr_get_is_valid(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index 7958c16ca81..17813d0ab52 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -40,9 +40,9 @@ PyTypeObject CValue::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"CValue",
-	sizeof(CValue),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
index 171d3fbc265..251a586308e 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
@@ -113,9 +113,9 @@ PyTypeObject SCA_2DFilterActuator::Type = {
         PyObject_HEAD_INIT(NULL)
         0,
         "SCA_2DFilterActuator",
-        sizeof(SCA_2DFilterActuator),
+        sizeof(PyObjectPlus_Proxy),
         0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/GameLogic/SCA_ANDController.cpp b/source/gameengine/GameLogic/SCA_ANDController.cpp
index cb62e2b5a1d..1cb03f375cb 100644
--- a/source/gameengine/GameLogic/SCA_ANDController.cpp
+++ b/source/gameengine/GameLogic/SCA_ANDController.cpp
@@ -110,9 +110,9 @@ PyTypeObject SCA_ANDController::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ANDController",
-	sizeof(SCA_ANDController),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
index 99f3788ad2e..c51555a02b4 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
@@ -125,9 +125,9 @@ PyTypeObject SCA_ActuatorSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ActuatorSensor",
-	sizeof(SCA_ActuatorSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp b/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
index a7b0e5a14d2..b7ecb0233a1 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
@@ -108,9 +108,9 @@ PyTypeObject SCA_AlwaysSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_AlwaysSensor",
-	sizeof(SCA_AlwaysSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.cpp b/source/gameengine/GameLogic/SCA_DelaySensor.cpp
index 3f08f301dc1..dad85a435c8 100644
--- a/source/gameengine/GameLogic/SCA_DelaySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.cpp
@@ -134,9 +134,9 @@ PyTypeObject SCA_DelaySensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_DelaySensor",
-	sizeof(SCA_DelaySensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
index 7fa55cfb1ee..1ae78321959 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
@@ -220,9 +220,9 @@ PyTypeObject SCA_ILogicBrick::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ILogicBrick",
-	sizeof(SCA_ILogicBrick),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_IObject.cpp b/source/gameengine/GameLogic/SCA_IObject.cpp
index d1ce377316b..75804525e7a 100644
--- a/source/gameengine/GameLogic/SCA_IObject.cpp
+++ b/source/gameengine/GameLogic/SCA_IObject.cpp
@@ -378,9 +378,9 @@ PyTypeObject SCA_IObject::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_IObject",
-	sizeof(SCA_IObject),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp
index 3c21cf66e09..269038db4f9 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ISensor.cpp
@@ -396,9 +396,9 @@ PyTypeObject SCA_ISensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ISensor",
-	sizeof(SCA_ISensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 9cf850ceb3e..087fb036fae 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -269,9 +269,9 @@ PyTypeObject SCA_JoystickSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"SCA_JoystickSensor",
-		sizeof(SCA_JoystickSensor),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index 0bf19360b15..3e19c880c4d 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -615,9 +615,9 @@ PyTypeObject SCA_KeyboardSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_KeyboardSensor",
-	sizeof(SCA_KeyboardSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
index 86e64491f6a..0c30f503068 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
@@ -303,9 +303,9 @@ PyTypeObject SCA_MouseSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_MouseSensor",
-	sizeof(SCA_MouseSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_NANDController.cpp b/source/gameengine/GameLogic/SCA_NANDController.cpp
index bddd5f4d3ab..703c9c1bbaf 100644
--- a/source/gameengine/GameLogic/SCA_NANDController.cpp
+++ b/source/gameengine/GameLogic/SCA_NANDController.cpp
@@ -110,9 +110,9 @@ PyTypeObject SCA_NANDController::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_NANDController",
-	sizeof(SCA_NANDController),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_NORController.cpp b/source/gameengine/GameLogic/SCA_NORController.cpp
index 3ee073523c3..06acae5a81a 100644
--- a/source/gameengine/GameLogic/SCA_NORController.cpp
+++ b/source/gameengine/GameLogic/SCA_NORController.cpp
@@ -110,9 +110,9 @@ PyTypeObject SCA_NORController::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_NORController",
-	sizeof(SCA_NORController),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_ORController.cpp b/source/gameengine/GameLogic/SCA_ORController.cpp
index 91d5e56d4f3..319ff04f776 100644
--- a/source/gameengine/GameLogic/SCA_ORController.cpp
+++ b/source/gameengine/GameLogic/SCA_ORController.cpp
@@ -102,9 +102,9 @@ PyTypeObject SCA_ORController::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_ORController",
-	sizeof(SCA_ORController),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
index 9dbdc0e89d1..4bcb59d0812 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
@@ -236,9 +236,9 @@ PyTypeObject SCA_PropertyActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_PropertyActuator",
-	sizeof(SCA_PropertyActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
index 9ae7be16b12..5c8a14db563 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
@@ -309,9 +309,9 @@ PyTypeObject SCA_PropertySensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_PropertySensor",
-	sizeof(SCA_PropertySensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 687ae421af1..0d096385fa9 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -227,9 +227,9 @@ PyTypeObject SCA_PythonController::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"SCA_PythonController",
-		sizeof(SCA_PythonController),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
@@ -441,9 +441,7 @@ SCA_PythonController::PyGetSensor(PyObject* self, PyObject* value)
 		}
 	}
 	
-	char emsg[96];
-	PyOS_snprintf( emsg, sizeof( emsg ), "Unable to find requested sensor \"%s\"", scriptArg );
-	PyErr_SetString(PyExc_AttributeError, emsg);
+	PyErr_Format(PyExc_AttributeError, "Unable to find requested sensor \"%s\"", scriptArg);
 	return NULL;
 }
 
@@ -470,9 +468,7 @@ SCA_PythonController::PyGetActuator(PyObject* self, PyObject* value)
 		}
 	}
 	
-	char emsg[96];
-	PyOS_snprintf( emsg, sizeof( emsg ), "Unable to find requested actuator \"%s\"", scriptArg );
-	PyErr_SetString(PyExc_AttributeError, emsg);
+	PyErr_Format(PyExc_AttributeError, "Unable to find requested actuator \"%s\"", scriptArg);
 	return NULL;
 }
 
diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.cpp b/source/gameengine/GameLogic/SCA_RandomActuator.cpp
index d5d993c4ba6..7a3fdc862f6 100644
--- a/source/gameengine/GameLogic/SCA_RandomActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_RandomActuator.cpp
@@ -315,9 +315,9 @@ PyTypeObject SCA_RandomActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_RandomActuator",
-	sizeof(SCA_RandomActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.cpp b/source/gameengine/GameLogic/SCA_RandomSensor.cpp
index 3179c8522f9..b0bc518825b 100644
--- a/source/gameengine/GameLogic/SCA_RandomSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_RandomSensor.cpp
@@ -130,9 +130,9 @@ PyTypeObject SCA_RandomSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_RandomSensor",
-	sizeof(SCA_RandomSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_XNORController.cpp b/source/gameengine/GameLogic/SCA_XNORController.cpp
index 10757e1c935..e9bb37ee958 100644
--- a/source/gameengine/GameLogic/SCA_XNORController.cpp
+++ b/source/gameengine/GameLogic/SCA_XNORController.cpp
@@ -114,9 +114,9 @@ PyTypeObject SCA_XNORController::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_XNORController",
-	sizeof(SCA_XNORController),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/GameLogic/SCA_XORController.cpp b/source/gameengine/GameLogic/SCA_XORController.cpp
index d2290fe207a..791a139975f 100644
--- a/source/gameengine/GameLogic/SCA_XORController.cpp
+++ b/source/gameengine/GameLogic/SCA_XORController.cpp
@@ -114,9 +114,9 @@ PyTypeObject SCA_XORController::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"SCA_XORController",
-	sizeof(SCA_XORController),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index aae4fd74a08..01b6805ae7a 100644
--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@@ -775,9 +775,9 @@ PyTypeObject BL_Shader::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"BL_Shader",
-		sizeof(BL_Shader),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
index d6d59692745..c3b27d4d6e6 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
@@ -108,9 +108,9 @@ PyTypeObject KX_NetworkMessageActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_NetworkMessageActuator",
-	sizeof(KX_NetworkMessageActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
index 8aca2e372d1..9fd30450515 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ -171,9 +171,9 @@ PyTypeObject KX_NetworkMessageSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_NetworkMessageSensor",
-	sizeof(KX_NetworkMessageSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index bdad21f76eb..6722cd232fe 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -756,9 +756,9 @@ PyTypeObject KX_BlenderMaterial::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_BlenderMaterial",
-		sizeof(KX_BlenderMaterial),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_CDActuator.cpp b/source/gameengine/Ketsji/KX_CDActuator.cpp
index c3d28656159..56610f2e787 100644
--- a/source/gameengine/Ketsji/KX_CDActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CDActuator.cpp
@@ -161,9 +161,9 @@ PyTypeObject KX_CDActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_SoundActuator",
-		sizeof(KX_CDActuator),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp
index daa37056d68..db8186e4586 100644
--- a/source/gameengine/Ketsji/KX_Camera.cpp
+++ b/source/gameengine/Ketsji/KX_Camera.cpp
@@ -509,9 +509,9 @@ PyTypeObject KX_Camera::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_Camera",
-		sizeof(KX_Camera),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp
index a1159dbc23f..35165af1f82 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp
@@ -374,9 +374,9 @@ PyTypeObject KX_CameraActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_CameraActuator",
-	sizeof(KX_CameraActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
index 3b8b4a93fd6..fc15568ae4f 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
@@ -569,9 +569,9 @@ PyTypeObject KX_ConstraintActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_ConstraintActuator",
-	sizeof(KX_ConstraintActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
index 6f4d970c568..d5577584616 100644
--- a/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
@@ -72,9 +72,9 @@ PyTypeObject KX_ConstraintWrapper::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_ConstraintWrapper",
-		sizeof(KX_ConstraintWrapper),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_GameActuator.cpp b/source/gameengine/Ketsji/KX_GameActuator.cpp
index cef874900a6..215c30d65b5 100644
--- a/source/gameengine/Ketsji/KX_GameActuator.cpp
+++ b/source/gameengine/Ketsji/KX_GameActuator.cpp
@@ -211,9 +211,9 @@ PyTypeObject KX_GameActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_GameActuator",
-		sizeof(KX_GameActuator),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 402c242315a..60d2fb0a2f6 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -1367,9 +1367,9 @@ PyTypeObject KX_GameObject::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_GameObject",
-		sizeof(KX_GameObject),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index 644f8ac8113..558b77c1f77 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -416,9 +416,9 @@ PyTypeObject KX_IpoActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_IpoActuator",
-	sizeof(KX_IpoActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp
index 29033c2d802..713838c88ec 100644
--- a/source/gameengine/Ketsji/KX_Light.cpp
+++ b/source/gameengine/Ketsji/KX_Light.cpp
@@ -328,9 +328,9 @@ PyTypeObject KX_LightObject::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_LightObject",
-		sizeof(KX_LightObject),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp
index 09e19933dd9..8ce5e888349 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.cpp
+++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp
@@ -49,9 +49,9 @@ PyTypeObject KX_MeshProxy::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_MeshProxy",
-	sizeof(KX_MeshProxy),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
index e1b89eb3095..b59f18bf935 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -338,9 +338,9 @@ PyTypeObject KX_MouseFocusSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_MouseFocusSensor",
-	sizeof(KX_MouseFocusSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp
index b9d1939e5db..0489b7090e9 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.cpp
+++ b/source/gameengine/Ketsji/KX_NearSensor.cpp
@@ -289,9 +289,9 @@ PyTypeObject KX_NearSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_NearSensor",
-	sizeof(KX_NearSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
index 0ea051723dc..4f1890772d7 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
@@ -280,9 +280,9 @@ PyTypeObject KX_ObjectActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_ObjectActuator",
-	sizeof(KX_ObjectActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp
index a667b459c22..5263dd72065 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp
@@ -142,9 +142,9 @@ PyTypeObject KX_ParentActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_ParentActuator",
-	sizeof(KX_ParentActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
index 9da86193622..f000d079927 100644
--- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
@@ -124,9 +124,9 @@ PyTypeObject KX_PhysicsObjectWrapper::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_PhysicsObjectWrapper",
-		sizeof(KX_PhysicsObjectWrapper),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp
index c03d585395c..e227ba09fba 100644
--- a/source/gameengine/Ketsji/KX_PolyProxy.cpp
+++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp
@@ -42,9 +42,9 @@ PyTypeObject KX_PolyProxy::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_PolyProxy",
-	sizeof(KX_PolyProxy),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
index bf1fbe386e6..46d04486cc6 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
@@ -211,9 +211,9 @@ PyTypeObject KX_PolygonMaterial::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_PolygonMaterial",
-		sizeof(KX_PolygonMaterial),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp
index b9abe69633e..40af3b22aeb 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.cpp
+++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp
@@ -254,9 +254,9 @@ PyTypeObject KX_RadarSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_RadarSensor",
-	sizeof(KX_RadarSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp
index 9dfc8243330..080a217b9bd 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.cpp
+++ b/source/gameengine/Ketsji/KX_RaySensor.cpp
@@ -324,9 +324,9 @@ PyTypeObject KX_RaySensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_RaySensor",
-	sizeof(KX_RaySensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
index 975e6d9d6cc..1ab4bd21120 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
@@ -170,9 +170,9 @@ PyTypeObject KX_SCA_AddObjectActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_SCA_AddObjectActuator",
-	sizeof(KX_SCA_AddObjectActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
index e03b153d813..9c9cdcd6c4c 100644
--- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
@@ -54,9 +54,9 @@ KX_SCA_DynamicActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_SCA_DynamicActuator",
-	sizeof(KX_SCA_DynamicActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
index 0db9e1c4930..3b42577810e 100644
--- a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
@@ -97,9 +97,9 @@ PyTypeObject KX_SCA_EndObjectActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_SCA_EndObjectActuator",
-	sizeof(KX_SCA_EndObjectActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
index 999b017b64c..b678b14c2f5 100644
--- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
@@ -56,9 +56,9 @@ KX_SCA_ReplaceMeshActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_SCA_ReplaceMeshActuator",
-	sizeof(KX_SCA_ReplaceMeshActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index d8d6f215213..96f2f3e8ed3 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1582,9 +1582,9 @@ PyTypeObject KX_Scene::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_Scene",
-		sizeof(KX_Scene),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp
index b52cc81f68b..414251d6b06 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp
@@ -229,9 +229,9 @@ PyTypeObject KX_SceneActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_SceneActuator",
-		sizeof(KX_SceneActuator),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp
index 6381c43e1c6..d7449c7effa 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp
@@ -237,9 +237,9 @@ PyTypeObject KX_SoundActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_SoundActuator",
-		sizeof(KX_SoundActuator),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_StateActuator.cpp b/source/gameengine/Ketsji/KX_StateActuator.cpp
index a251a987935..3cfa40c6f80 100644
--- a/source/gameengine/Ketsji/KX_StateActuator.cpp
+++ b/source/gameengine/Ketsji/KX_StateActuator.cpp
@@ -112,9 +112,9 @@ PyTypeObject KX_StateActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_StateActuator",
-	sizeof(KX_StateActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index 7265ade6789..79da4984740 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.cpp
+++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp
@@ -245,9 +245,9 @@ PyTypeObject KX_TouchSensor::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_TouchSensor",
-	sizeof(KX_TouchSensor),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
index 5ea08f855a3..6c522b35528 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
@@ -428,9 +428,9 @@ PyTypeObject KX_TrackToActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_TrackToActuator",
-	sizeof(KX_TrackToActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
index 0ba55fe5986..558b2849cc7 100644
--- a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
@@ -305,9 +305,9 @@ PyTypeObject KX_VehicleWrapper::Type = {
 	PyObject_HEAD_INIT(NULL)
 		0,
 		"KX_VehicleWrapper",
-		sizeof(KX_VehicleWrapper),
+		sizeof(PyObjectPlus_Proxy),
 		0,
-		PyDestructor,
+		py_base_dealloc,
 		0,
 		0,
 		0,
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.cpp b/source/gameengine/Ketsji/KX_VertexProxy.cpp
index 6a160dff7b7..4954e94f3e4 100644
--- a/source/gameengine/Ketsji/KX_VertexProxy.cpp
+++ b/source/gameengine/Ketsji/KX_VertexProxy.cpp
@@ -40,9 +40,9 @@ PyTypeObject KX_VertexProxy::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_VertexProxy",
-	sizeof(KX_VertexProxy),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,
diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.cpp b/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
index fceb0b5922c..6d984f0d77a 100644
--- a/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
+++ b/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
@@ -97,9 +97,9 @@ PyTypeObject KX_VisibilityActuator::Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,
 	"KX_VisibilityActuator",
-	sizeof(KX_VisibilityActuator),
+	sizeof(PyObjectPlus_Proxy),
 	0,
-	PyDestructor,
+	py_base_dealloc,
 	0,
 	0,
 	0,