BGE Python API cleanup - no functionality changes
authorCampbell Barton <ideasman42@gmail.com>
Sun, 19 Apr 2009 14:57:52 +0000 (14:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 19 Apr 2009 14:57:52 +0000 (14:57 +0000)
- 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:
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Expressions/ListValue.cpp
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/Expressions/Value.cpp
source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
source/gameengine/GameLogic/SCA_ANDController.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
source/gameengine/GameLogic/SCA_DelaySensor.cpp
source/gameengine/GameLogic/SCA_ILogicBrick.cpp
source/gameengine/GameLogic/SCA_IObject.cpp
source/gameengine/GameLogic/SCA_ISensor.cpp
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GameLogic/SCA_NANDController.cpp
source/gameengine/GameLogic/SCA_NORController.cpp
source/gameengine/GameLogic/SCA_ORController.cpp
source/gameengine/GameLogic/SCA_PropertyActuator.cpp
source/gameengine/GameLogic/SCA_PropertySensor.cpp
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/GameLogic/SCA_RandomActuator.cpp
source/gameengine/GameLogic/SCA_RandomSensor.cpp
source/gameengine/GameLogic/SCA_XNORController.cpp
source/gameengine/GameLogic/SCA_XORController.cpp
source/gameengine/Ketsji/BL_Shader.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_CDActuator.cpp
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_CameraActuator.cpp
source/gameengine/Ketsji/KX_ConstraintActuator.cpp
source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
source/gameengine/Ketsji/KX_GameActuator.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_IpoActuator.cpp
source/gameengine/Ketsji/KX_Light.cpp
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_ObjectActuator.cpp
source/gameengine/Ketsji/KX_ParentActuator.cpp
source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
source/gameengine/Ketsji/KX_PolyProxy.cpp
source/gameengine/Ketsji/KX_PolygonMaterial.cpp
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_RaySensor.cpp
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_SceneActuator.cpp
source/gameengine/Ketsji/KX_SoundActuator.cpp
source/gameengine/Ketsji/KX_StateActuator.cpp
source/gameengine/Ketsji/KX_TouchSensor.cpp
source/gameengine/Ketsji/KX_TrackToActuator.cpp
source/gameengine/Ketsji/KX_VehicleWrapper.cpp
source/gameengine/Ketsji/KX_VertexProxy.cpp
source/gameengine/Ketsji/KX_VisibilityActuator.cpp

index 960eafda230bed862200dd26354dd5241ec6135b..530a74dfb12e2e89460e7e19d49d0a513a53498c 100644 (file)
@@ -968,9 +968,9 @@ PyTypeObject BL_ActionActuator::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "BL_ActionActuator",
        PyObject_HEAD_INIT(NULL)
                0,
                "BL_ActionActuator",
-               sizeof(BL_ActionActuator),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index 0d35b26d6043c6cc6a38658813795da3fd79bcb2..783fdd814b7cdcd27b4c2b2f7c0c4a198ce4e665 100644 (file)
@@ -423,9 +423,9 @@ PyTypeObject BL_ShapeActionActuator::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "BL_ShapeActionActuator",
        PyObject_HEAD_INIT(NULL)
                0,
                "BL_ShapeActionActuator",
-               sizeof(BL_ShapeActionActuator),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index eaed2b5c4001948e60fb155e6d310d8ddbd08bd3..5bb1eb0aeb901cdaf36ef1bf0cad38324be2d0cf 100644 (file)
@@ -223,10 +223,10 @@ PyTypeObject CListValue::Type = {
        PyObject_HEAD_INIT(NULL)
        0,                              /*ob_size*/
        "CListValue",                   /*tp_name*/
        PyObject_HEAD_INIT(NULL)
        0,                              /*ob_size*/
        "CListValue",                   /*tp_name*/
-       sizeof(CListValue),             /*tp_basicsize*/
+       sizeof(PyObjectPlus_Proxy), /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */
        0,                              /*tp_itemsize*/
        /* methods */
-       PyDestructor,                   /*tp_dealloc*/
+       py_base_dealloc,                        /*tp_dealloc*/
        0,                              /*tp_print*/
        0,                      /*tp_getattr*/
        0,                      /*tp_setattr*/
        0,                              /*tp_print*/
        0,                      /*tp_getattr*/
        0,                      /*tp_setattr*/
index 2c5ba3f39fc7bd80baa9b219f787624343111f76..3c414c6b16d6c89f04275d447df85545bdaa5b19 100644 (file)
@@ -59,10 +59,10 @@ PyTypeObject PyObjectPlus::Type = {
        PyObject_HEAD_INIT(NULL)
        0,                              /*ob_size*/
        "PyObjectPlus",                 /*tp_name*/
        PyObject_HEAD_INIT(NULL)
        0,                              /*ob_size*/
        "PyObjectPlus",                 /*tp_name*/
-       sizeof(PyObjectPlus),           /*tp_basicsize*/
+       sizeof(PyObjectPlus_Proxy),             /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */
        0,                              /*tp_itemsize*/
        /* methods */
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
@@ -85,7 +85,7 @@ PyObjectPlus::~PyObjectPlus()
 //     assert(ob_refcnt==0);
 }
 
 //     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) {
 {
        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[] = {
  * 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 */
 };
 
   {NULL, NULL}         /* Sentinel */
 };
 
@@ -130,6 +130,49 @@ PyParentObject PyObjectPlus::Parents[] = {&PyObjectPlus::Type, NULL};
 /*------------------------------
  * PyObjectPlus attributes     -- attributes
 ------------------------------*/
 /*------------------------------
  * 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); \
 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 */
        }
                }
                /* end py_getattro_up copy */
        }
-  //if (streq(attr, "type"))
-  //  return Py_BuildValue("s", (*(GetParents()))->tp_name);
 }
 
 int PyObjectPlus::py_delattro(PyObject* attr)
 }
 
 int PyObjectPlus::py_delattro(PyObject* attr)
@@ -163,8 +204,6 @@ int PyObjectPlus::py_delattro(PyObject* attr)
 
 int PyObjectPlus::py_setattro(PyObject *attr, PyObject* value)
 {
 
 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;
 }
        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;
 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;       
 }
 
        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
 
 /*------------------------------
  * PyObjectPlus repr           -- representations
@@ -777,7 +780,7 @@ bool PyObjectPlus::isA(const char *mytypename)              // check typename of each parent
        return false;
 }
 
        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));
 {
        if (PyType_Check(value)) {
                return PyBool_FromLong(isA((PyTypeObject *)value));
index 3be9a2f2bcb82eb45094fb8a7ca40448c5a4b548..9f30e6570ee5d1f191fe8571f9d9308f0726333d 100644 (file)
    also in api2_2x/gen_utils.h 
 */
 #ifndef Py_RETURN_NONE
    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
 #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
 #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 */
 #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_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 
 
 
                                                                // This must be the first line of each 
@@ -429,80 +429,34 @@ public:
        PyObject *m_proxy; /* actually a PyObjectPlus_Proxy */
        
        virtual ~PyObjectPlus();                                        // destructor
        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);
        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);
        
        /* 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);
index 7958c16ca81c0cc21697acc5bbfacbf6befed8d5..17813d0ab5215edff6ef739d7b0d93f972a833fc 100644 (file)
@@ -40,9 +40,9 @@ PyTypeObject CValue::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "CValue",
        PyObject_HEAD_INIT(NULL)
        0,
        "CValue",
-       sizeof(CValue),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 171d3fbc2653c7d8af31c82cd0d30186f04b278d..251a586308ec87a110d803402137dbcc8841dd19 100644 (file)
@@ -113,9 +113,9 @@ PyTypeObject SCA_2DFilterActuator::Type = {
         PyObject_HEAD_INIT(NULL)
         0,
         "SCA_2DFilterActuator",
         PyObject_HEAD_INIT(NULL)
         0,
         "SCA_2DFilterActuator",
-        sizeof(SCA_2DFilterActuator),
+        sizeof(PyObjectPlus_Proxy),
         0,
         0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index cb62e2b5a1dc871dc4e882b26f13b50ad39ac208..1cb03f375cb850c218f9ac830bd2b98e11d04275 100644 (file)
@@ -110,9 +110,9 @@ PyTypeObject SCA_ANDController::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ANDController",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ANDController",
-       sizeof(SCA_ANDController),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 99f3788ad2e61124c817d8a65e7dfec077377e22..c51555a02b445bfd2713137894d982c6b0cb3e31 100644 (file)
@@ -125,9 +125,9 @@ PyTypeObject SCA_ActuatorSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ActuatorSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ActuatorSensor",
-       sizeof(SCA_ActuatorSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index a7b0e5a14d2244c5d1eea21df5fa71e7a166451b..b7ecb0233a1c3ae13af5f2f99f8fe3b8f560716b 100644 (file)
@@ -108,9 +108,9 @@ PyTypeObject SCA_AlwaysSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_AlwaysSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_AlwaysSensor",
-       sizeof(SCA_AlwaysSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 3f08f301dc1efd17f6cf2ea11cdeaa8b3e8191d2..dad85a435c8e670463d6ea10eed06526a87df981 100644 (file)
@@ -134,9 +134,9 @@ PyTypeObject SCA_DelaySensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_DelaySensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_DelaySensor",
-       sizeof(SCA_DelaySensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 7fa55cfb1eef28e736c98ff7f9605cc729202e20..1ae78321959d3ce59275b82b6d0058d5c9193362 100644 (file)
@@ -220,9 +220,9 @@ PyTypeObject SCA_ILogicBrick::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ILogicBrick",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ILogicBrick",
-       sizeof(SCA_ILogicBrick),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index d1ce377316b9a9f42428dbd1ce81d3a1e63f0c19..75804525e7a05e15ccdc46907ac7620ffad84d74 100644 (file)
@@ -378,9 +378,9 @@ PyTypeObject SCA_IObject::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_IObject",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_IObject",
-       sizeof(SCA_IObject),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 3c21cf66e09b172bb64af507129ae855ce389606..269038db4f944062b826cccca65c2ce055928e0a 100644 (file)
@@ -396,9 +396,9 @@ PyTypeObject SCA_ISensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ISensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ISensor",
-       sizeof(SCA_ISensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 9cf850ceb3e1ed64030da70d00892982fb028649..087fb036fae77cd79856d2bb3d8d2f03e84617fd 100644 (file)
@@ -269,9 +269,9 @@ PyTypeObject SCA_JoystickSensor::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "SCA_JoystickSensor",
        PyObject_HEAD_INIT(NULL)
                0,
                "SCA_JoystickSensor",
-               sizeof(SCA_JoystickSensor),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index 0bf19360b15103b113b4af76bf5cae2d47d781c4..3e19c880c4dd562cb11e3eb959fc9bc331069c5c 100644 (file)
@@ -615,9 +615,9 @@ PyTypeObject SCA_KeyboardSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_KeyboardSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_KeyboardSensor",
-       sizeof(SCA_KeyboardSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 86e64491f6a50999fee37c7b9e7ca76d0708a9d2..0c30f50306865d98852c7fb2d551eb773ba96032 100644 (file)
@@ -303,9 +303,9 @@ PyTypeObject SCA_MouseSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_MouseSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_MouseSensor",
-       sizeof(SCA_MouseSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index bddd5f4d3abafd45b88710ba50062ae7a6720824..703c9c1bbaf18da56afb7a03c69a0f35427597fa 100644 (file)
@@ -110,9 +110,9 @@ PyTypeObject SCA_NANDController::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_NANDController",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_NANDController",
-       sizeof(SCA_NANDController),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 3ee073523c3dd56027a4f42227644c2fa280b8b5..06acae5a81a4cf36899ab3153433af8fdcc094f2 100644 (file)
@@ -110,9 +110,9 @@ PyTypeObject SCA_NORController::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_NORController",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_NORController",
-       sizeof(SCA_NORController),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 91d5e56d4f365a33f9fd54d385d82abdfa7eb516..319ff04f776b156118450d83f9e05cbd79e711ed 100644 (file)
@@ -102,9 +102,9 @@ PyTypeObject SCA_ORController::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ORController",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_ORController",
-       sizeof(SCA_ORController),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 9dbdc0e89d10bc534f89073b2f83d52c62da2b35..4bcb59d0812ef85cb662ae7e420404e4b9d68374 100644 (file)
@@ -236,9 +236,9 @@ PyTypeObject SCA_PropertyActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_PropertyActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_PropertyActuator",
-       sizeof(SCA_PropertyActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 9ae7be16b124917e0ecf0af953b0d33b1e995f08..5c8a14db563085335275ad8e3d06e2477e8939c6 100644 (file)
@@ -309,9 +309,9 @@ PyTypeObject SCA_PropertySensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_PropertySensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_PropertySensor",
-       sizeof(SCA_PropertySensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 687ae421af112d153de39bb415a901ddff57d7f9..0d096385fa9a95e1f86dfdc9870ee9a27d10a0ee 100644 (file)
@@ -227,9 +227,9 @@ PyTypeObject SCA_PythonController::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "SCA_PythonController",
        PyObject_HEAD_INIT(NULL)
                0,
                "SCA_PythonController",
-               sizeof(SCA_PythonController),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                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;
 }
 
        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;
 }
 
        return NULL;
 }
 
index d5d993c4ba61c80f9c65d9095c2cb02670f80cbf..7a3fdc862f6e8db45972a2fc65b1af249d2a37e4 100644 (file)
@@ -315,9 +315,9 @@ PyTypeObject SCA_RandomActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_RandomActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_RandomActuator",
-       sizeof(SCA_RandomActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 3179c8522f9d373102769338d0bf156b88d189dc..b0bc518825b01afa8b6b45426a9dc9bf36192216 100644 (file)
@@ -130,9 +130,9 @@ PyTypeObject SCA_RandomSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_RandomSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_RandomSensor",
-       sizeof(SCA_RandomSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 10757e1c9355768fad7f4586fa501aec5aed0e2f..e9bb37ee958e37c3de58bd47d95bbc3db7cb05d1 100644 (file)
@@ -114,9 +114,9 @@ PyTypeObject SCA_XNORController::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_XNORController",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_XNORController",
-       sizeof(SCA_XNORController),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index d2290fe207a4a32b4737f680f080c04eeb9cfcde..791a139975f11d8a5ab2d4cb5093291a10168a72 100644 (file)
@@ -114,9 +114,9 @@ PyTypeObject SCA_XORController::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_XORController",
        PyObject_HEAD_INIT(NULL)
        0,
        "SCA_XORController",
-       sizeof(SCA_XORController),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index aae4fd74a085a18e7d53d0bd52048ec313b424ea..01b6805ae7abecbe72331553304277a46af8235f 100644 (file)
@@ -775,9 +775,9 @@ PyTypeObject BL_Shader::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "BL_Shader",
        PyObject_HEAD_INIT(NULL)
                0,
                "BL_Shader",
-               sizeof(BL_Shader),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index d6d596927454ca29cbbdb823b6ee5c3d2462b9d8..c3b27d4d6e659d553dc73be62612d9b486277b78 100644 (file)
@@ -108,9 +108,9 @@ PyTypeObject KX_NetworkMessageActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_NetworkMessageActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_NetworkMessageActuator",
-       sizeof(KX_NetworkMessageActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 8aca2e372d1abeb114b148332d3c957efa161eda..9fd304505150875218246b848cc01c042c9686a8 100644 (file)
@@ -171,9 +171,9 @@ PyTypeObject KX_NetworkMessageSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_NetworkMessageSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_NetworkMessageSensor",
-       sizeof(KX_NetworkMessageSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index bdad21f76ebb415eaab173c734a93b5a8ceabd2e..6722cd232fe8c8a3392a8414585001ed25992bbb 100644 (file)
@@ -756,9 +756,9 @@ PyTypeObject KX_BlenderMaterial::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_BlenderMaterial",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_BlenderMaterial",
-               sizeof(KX_BlenderMaterial),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index c3d2865615918f9c6f1a104c1ca4138d7bc7a693..56610f2e787d4012444522c070ade41e94bb0621 100644 (file)
@@ -161,9 +161,9 @@ PyTypeObject KX_CDActuator::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_SoundActuator",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_SoundActuator",
-               sizeof(KX_CDActuator),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index daa37056d6869128e04e9a77ba171f1fc6a01142..db8186e45860a76f786c42100018fccb35e9361c 100644 (file)
@@ -509,9 +509,9 @@ PyTypeObject KX_Camera::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_Camera",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_Camera",
-               sizeof(KX_Camera),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index a1159dbc23f9dd39b95efedc2a295556e1ddd5de..35165af1f824f6d1f9f23e60622a36d3c4d76b09 100644 (file)
@@ -374,9 +374,9 @@ PyTypeObject KX_CameraActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_CameraActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_CameraActuator",
-       sizeof(KX_CameraActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 3b8b4a93fd6a709830902398886bdaa7794420bb..fc15568ae4f4868a3ca8f9680e4b085285152cc3 100644 (file)
@@ -569,9 +569,9 @@ PyTypeObject KX_ConstraintActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_ConstraintActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_ConstraintActuator",
-       sizeof(KX_ConstraintActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 6f4d970c568a44dd20f841cb29357885eec98573..d557758461624e339f7a5c13ecc6fc6fffffcc9a 100644 (file)
@@ -72,9 +72,9 @@ PyTypeObject KX_ConstraintWrapper::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_ConstraintWrapper",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_ConstraintWrapper",
-               sizeof(KX_ConstraintWrapper),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index cef874900a64e210ab226d0543c217ec56333860..215c30d65b57ae37f148f2482cc1c10c4f8d14f0 100644 (file)
@@ -211,9 +211,9 @@ PyTypeObject KX_GameActuator::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_GameActuator",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_GameActuator",
-               sizeof(KX_GameActuator),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index 402c242315aebf1e3a6fe05b3aca6bede6be552a..60d2fb0a2f6a5364502f06b9d7137707c79dc26a 100644 (file)
@@ -1367,9 +1367,9 @@ PyTypeObject KX_GameObject::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_GameObject",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_GameObject",
-               sizeof(KX_GameObject),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index 644f8ac81132fcf7ef8ba08a801999c9cfb70729..558b77c1f777b710d8773b8a86e09283e04baa63 100644 (file)
@@ -416,9 +416,9 @@ PyTypeObject KX_IpoActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_IpoActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_IpoActuator",
-       sizeof(KX_IpoActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 29033c2d802179ad897300047b1c3b63977e4d25..713838c88ece2257fcd4ed0bc4b90cf57fda6d1b 100644 (file)
@@ -328,9 +328,9 @@ PyTypeObject KX_LightObject::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_LightObject",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_LightObject",
-               sizeof(KX_LightObject),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index 09e19933dd93e46d7f4a259e03ccff208f0d6e54..8ce5e88834924a2a037ecd58b78b7b2da9b07736 100644 (file)
@@ -49,9 +49,9 @@ PyTypeObject KX_MeshProxy::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_MeshProxy",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_MeshProxy",
-       sizeof(KX_MeshProxy),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index e1b89eb3095881df5387249c6c1138c05f7975f6..b59f18bf93528a0b23bd09231bb95a6583cd8f1e 100644 (file)
@@ -338,9 +338,9 @@ PyTypeObject KX_MouseFocusSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_MouseFocusSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_MouseFocusSensor",
-       sizeof(KX_MouseFocusSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index b9d1939e5db0868fa96cded948934e46bbb2146e..0489b7090e9dfa4aee642b0c702b85c3bbdcfd5c 100644 (file)
@@ -289,9 +289,9 @@ PyTypeObject KX_NearSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_NearSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_NearSensor",
-       sizeof(KX_NearSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 0ea051723dcda60682a94fa8c622b4723b6ba809..4f1890772d708002fa7376b34edba6ebb828e98c 100644 (file)
@@ -280,9 +280,9 @@ PyTypeObject KX_ObjectActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_ObjectActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_ObjectActuator",
-       sizeof(KX_ObjectActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index a667b459c22650c76b488969cc7e2fe804ae797a..5263dd72065c26100c3228144fa001ddb63e0ce6 100644 (file)
@@ -142,9 +142,9 @@ PyTypeObject KX_ParentActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_ParentActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_ParentActuator",
-       sizeof(KX_ParentActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 9da861936224298a7241a9547de9de371a38fdfa..f000d0799278dde56399d439791b2b0288698ba1 100644 (file)
@@ -124,9 +124,9 @@ PyTypeObject KX_PhysicsObjectWrapper::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_PhysicsObjectWrapper",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_PhysicsObjectWrapper",
-               sizeof(KX_PhysicsObjectWrapper),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index c03d585395cf40fc328d018d96da4d0a4d0c2516..e227ba09fba1c4bb9134f5593155acfceb0c3dac 100644 (file)
@@ -42,9 +42,9 @@ PyTypeObject KX_PolyProxy::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_PolyProxy",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_PolyProxy",
-       sizeof(KX_PolyProxy),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index bf1fbe386e6f5f5094aaedc531d7d316f47af9dd..46d04486cc60236cf7a71d2e2c9ca98f979ea6f5 100644 (file)
@@ -211,9 +211,9 @@ PyTypeObject KX_PolygonMaterial::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_PolygonMaterial",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_PolygonMaterial",
-               sizeof(KX_PolygonMaterial),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index b9abe69633e6483e90af8179df680e768a8c098f..40af3b22aebb4ed4cfc21d135764b38f6c1b3ef0 100644 (file)
@@ -254,9 +254,9 @@ PyTypeObject KX_RadarSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_RadarSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_RadarSensor",
-       sizeof(KX_RadarSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 9dfc82433306a6474f9ec22c8d14e869dd76655b..080a217b9bda1ba69482d491ebeb86d192f3fabf 100644 (file)
@@ -324,9 +324,9 @@ PyTypeObject KX_RaySensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_RaySensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_RaySensor",
-       sizeof(KX_RaySensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 975e6d9d6cc2703111124e17c87f79572ccc8275..1ab4bd21120849ed7f1ba8c49c894e83fb69b68a 100644 (file)
@@ -170,9 +170,9 @@ PyTypeObject KX_SCA_AddObjectActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_SCA_AddObjectActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_SCA_AddObjectActuator",
-       sizeof(KX_SCA_AddObjectActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index e03b153d813f36a533a5ce6e66b4c48480837c62..9c9cdcd6c4c3d832b038ff050393ef80e1adc34c 100644 (file)
@@ -54,9 +54,9 @@ KX_SCA_DynamicActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_SCA_DynamicActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_SCA_DynamicActuator",
-       sizeof(KX_SCA_DynamicActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 0db9e1c49305ba2c695b2f7e3095cd9ca30782c9..3b42577810e217c1560648f221394c727aacbe9a 100644 (file)
@@ -97,9 +97,9 @@ PyTypeObject KX_SCA_EndObjectActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_SCA_EndObjectActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_SCA_EndObjectActuator",
-       sizeof(KX_SCA_EndObjectActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 999b017b64c18e315804ae95719bef145e791cf7..b678b14c2f5f95fc8cab5199db2aff4e8bc99f54 100644 (file)
@@ -56,9 +56,9 @@ KX_SCA_ReplaceMeshActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_SCA_ReplaceMeshActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_SCA_ReplaceMeshActuator",
-       sizeof(KX_SCA_ReplaceMeshActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index d8d6f2152132b01565067551646b0eeb96c7f671..96f2f3e8ed391210f1efeb0f7e737367b0fc183f 100644 (file)
@@ -1582,9 +1582,9 @@ PyTypeObject KX_Scene::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_Scene",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_Scene",
-               sizeof(KX_Scene),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index b52cc81f68b6d107b0e1bc83d4e3138d235ba934..414251d6b06d48ef4034ca7f3b35953d0a1d9a10 100644 (file)
@@ -229,9 +229,9 @@ PyTypeObject KX_SceneActuator::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_SceneActuator",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_SceneActuator",
-               sizeof(KX_SceneActuator),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index 6381c43e1c6423d50e2b14d4df94565a69abd93c..d7449c7effa08d1f32392e0dc4651825249f7fb9 100644 (file)
@@ -237,9 +237,9 @@ PyTypeObject KX_SoundActuator::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_SoundActuator",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_SoundActuator",
-               sizeof(KX_SoundActuator),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index a251a987935553ecf5a5c5161dc31faf1184d9b1..3cfa40c6f80855a9afd2a6c1e51d6198f0f98f8e 100644 (file)
@@ -112,9 +112,9 @@ PyTypeObject KX_StateActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_StateActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_StateActuator",
-       sizeof(KX_StateActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 7265ade67899369c8ae0d6e4fc38d08bd0e514d5..79da498474016b50b39c5ebab00821335f8bf2b2 100644 (file)
@@ -245,9 +245,9 @@ PyTypeObject KX_TouchSensor::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_TouchSensor",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_TouchSensor",
-       sizeof(KX_TouchSensor),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 5ea08f855a375a4eb54c60d3eb1cb7f433ed1d78..6c522b35528b38673a61e92d4283e0fb46fed16e 100644 (file)
@@ -428,9 +428,9 @@ PyTypeObject KX_TrackToActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_TrackToActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_TrackToActuator",
-       sizeof(KX_TrackToActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index 0ba55fe59865a5ea8f52616d5b5b3397d8b3d05b..558b2849cc77f0b75016a3ceb70ac3fd931f7245 100644 (file)
@@ -305,9 +305,9 @@ PyTypeObject KX_VehicleWrapper::Type = {
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_VehicleWrapper",
        PyObject_HEAD_INIT(NULL)
                0,
                "KX_VehicleWrapper",
-               sizeof(KX_VehicleWrapper),
+               sizeof(PyObjectPlus_Proxy),
                0,
                0,
-               PyDestructor,
+               py_base_dealloc,
                0,
                0,
                0,
                0,
                0,
                0,
index 6a160dff7b70b9e1e7a9454e77a6ad8251daf717..4954e94f3e4ad412af2038739fbd9faa086845af 100644 (file)
@@ -40,9 +40,9 @@ PyTypeObject KX_VertexProxy::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_VertexProxy",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_VertexProxy",
-       sizeof(KX_VertexProxy),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,
index fceb0b5922ca666039fb9098a519e5ed081bfe30..6d984f0d77abca743239623efa6865c173f3a7f9 100644 (file)
@@ -97,9 +97,9 @@ PyTypeObject KX_VisibilityActuator::Type = {
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_VisibilityActuator",
        PyObject_HEAD_INIT(NULL)
        0,
        "KX_VisibilityActuator",
-       sizeof(KX_VisibilityActuator),
+       sizeof(PyObjectPlus_Proxy),
        0,
        0,
-       PyDestructor,
+       py_base_dealloc,
        0,
        0,
        0,
        0,
        0,
        0,