Made the Freestyle Python API compatible with Python 3.
[blender.git] / source / blender / freestyle / intern / python / UnaryFunction0D / BPy_UnaryFunction0DVectorViewShape.cpp
index 93bea5c114e785a029a492bb78c9211bcdb8e556..66c22528e7f1d3a4c35a67b3999e5daefbfec17d 100644 (file)
@@ -12,128 +12,88 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for UnaryFunction0DVectorViewShape instance  -----------*/
-static int UnaryFunction0DVectorViewShape___init__(BPy_UnaryFunction0DVectorViewShape* self);
+static int UnaryFunction0DVectorViewShape___init__(BPy_UnaryFunction0DVectorViewShape* self, PyObject *args, PyObject *kwds);
 static void UnaryFunction0DVectorViewShape___dealloc__(BPy_UnaryFunction0DVectorViewShape* self);
 static PyObject * UnaryFunction0DVectorViewShape___repr__(BPy_UnaryFunction0DVectorViewShape* self);
 
 static PyObject * UnaryFunction0DVectorViewShape_getName( BPy_UnaryFunction0DVectorViewShape *self);
-static PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorViewShape *self, PyObject *args);
+static PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorViewShape *self, PyObject *args, PyObject *kwds);
 
 /*----------------------UnaryFunction0DVectorViewShape instance definitions ----------------------------*/
 static PyMethodDef BPy_UnaryFunction0DVectorViewShape_methods[] = {
-       {"getName", ( PyCFunction ) UnaryFunction0DVectorViewShape_getName, METH_NOARGS, "( )Returns the string of the name of the unary 0D function."},
-       {"__call__", ( PyCFunction ) UnaryFunction0DVectorViewShape___call__, METH_VARARGS, "(Interface0DIterator it )Executes the operator ()      on the iterator it pointing onto the point at which we wish to evaluate the function." },
+       {"getName", ( PyCFunction ) UnaryFunction0DVectorViewShape_getName, METH_NOARGS, "() Returns the string of the name of the unary 0D function."},
        {NULL, NULL, 0, NULL}
 };
 
 /*-----------------------BPy_UnaryFunction0DVectorViewShape type definition ------------------------------*/
 
 PyTypeObject UnaryFunction0DVectorViewShape_Type = {
-       PyObject_HEAD_INIT( NULL ) 
-       0,                                                      /* ob_size */
-       "UnaryFunction0DVectorViewShape",                               /* tp_name */
-       sizeof( BPy_UnaryFunction0DVectorViewShape ),   /* tp_basicsize */
-       0,                                                      /* tp_itemsize */
-       
-       /* methods */
-       (destructor)UnaryFunction0DVectorViewShape___dealloc__, /* tp_dealloc */
-       NULL,                                                   /* printfunc tp_print; */
-       NULL,                                                   /* getattrfunc tp_getattr; */
-       NULL,                                                   /* setattrfunc tp_setattr; */
-       NULL,                                                                           /* tp_compare */
-       (reprfunc)UnaryFunction0DVectorViewShape___repr__,                                      /* tp_repr */
-
-       /* Method suites for standard classes */
-
-       NULL,                       /* PyNumberMethods *tp_as_number; */
-       NULL,                       /* PySequenceMethods *tp_as_sequence; */
-       NULL,                       /* PyMappingMethods *tp_as_mapping; */
-
-       /* More standard operations (here for binary compatibility) */
-
-       NULL,                                           /* hashfunc tp_hash; */
-       NULL,                       /* ternaryfunc tp_call; */
-       NULL,                       /* reprfunc tp_str; */
-       NULL,                       /* getattrofunc tp_getattro; */
-       NULL,                       /* setattrofunc tp_setattro; */
-
-       /* Functions to access object as input/output buffer */
-       NULL,                       /* PyBufferProcs *tp_as_buffer; */
-
-  /*** Flags to define presence of optional/expanded features ***/
-       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,               /* long tp_flags; */
-
-       NULL,                       /*  char *tp_doc;  Documentation string */
-  /*** Assigned meaning in release 2.0 ***/
-       /* call function for all accessible objects */
-       NULL,                       /* traverseproc tp_traverse; */
-
-       /* delete references to contained objects */
-       NULL,                       /* inquiry tp_clear; */
-
-  /***  Assigned meaning in release 2.1 ***/
-  /*** rich comparisons ***/
-       NULL,                       /* richcmpfunc tp_richcompare; */
-
-  /***  weak reference enabler ***/
-       0,                          /* long tp_weaklistoffset; */
-
-  /*** Added in release 2.2 ***/
-       /*   Iterators */
-       NULL,                       /* getiterfunc tp_iter; */
-       NULL,                       /* iternextfunc tp_iternext; */
-
-  /*** Attribute descriptor and subclassing stuff ***/
-       BPy_UnaryFunction0DVectorViewShape_methods,     /* struct PyMethodDef *tp_methods; */
-       NULL,                           /* struct PyMemberDef *tp_members; */
-       NULL,                                           /* struct PyGetSetDef *tp_getset; */
-       &UnaryFunction0D_Type,                                                  /* struct _typeobject *tp_base; */
-       NULL,                                                   /* PyObject *tp_dict; */
-       NULL,                                                   /* descrgetfunc tp_descr_get; */
-       NULL,                                                   /* descrsetfunc tp_descr_set; */
-       0,                              /* long tp_dictoffset; */
-       (initproc)UnaryFunction0DVectorViewShape___init__, /* initproc tp_init; */
-       NULL,                                                   /* allocfunc tp_alloc; */
-       NULL,           /* newfunc tp_new; */
-       
-       /*  Low-level free-memory routine */
-       NULL,                       /* freefunc tp_free;  */
-       
-       /* For PyObject_IS_GC */
-       NULL,                       /* inquiry tp_is_gc;  */
-       NULL,                       /* PyObject *tp_bases; */
-       
-       /* method resolution order */
-       NULL,                       /* PyObject *tp_mro;  */
-       NULL,                       /* PyObject *tp_cache; */
-       NULL,                       /* PyObject *tp_subclasses; */
-       NULL,                       /* PyObject *tp_weaklist; */
-       NULL
+       PyVarObject_HEAD_INIT(NULL, 0)
+       "UnaryFunction0DVectorViewShape", /* tp_name */
+       sizeof(BPy_UnaryFunction0DVectorViewShape), /* tp_basicsize */
+       0,                              /* tp_itemsize */
+       (destructor)UnaryFunction0DVectorViewShape___dealloc__, /* tp_dealloc */
+       0,                              /* tp_print */
+       0,                              /* tp_getattr */
+       0,                              /* tp_setattr */
+       0,                              /* tp_reserved */
+       (reprfunc)UnaryFunction0DVectorViewShape___repr__, /* tp_repr */
+       0,                              /* tp_as_number */
+       0,                              /* tp_as_sequence */
+       0,                              /* tp_as_mapping */
+       0,                              /* tp_hash  */
+       (ternaryfunc)UnaryFunction0DVectorViewShape___call__, /* tp_call */
+       0,                              /* tp_str */
+       0,                              /* tp_getattro */
+       0,                              /* tp_setattro */
+       0,                              /* tp_as_buffer */
+       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+       "UnaryFunction0DVectorViewShape objects", /* tp_doc */
+       0,                              /* tp_traverse */
+       0,                              /* tp_clear */
+       0,                              /* tp_richcompare */
+       0,                              /* tp_weaklistoffset */
+       0,                              /* tp_iter */
+       0,                              /* tp_iternext */
+       BPy_UnaryFunction0DVectorViewShape_methods, /* tp_methods */
+       0,                              /* tp_members */
+       0,                              /* tp_getset */
+       &UnaryFunction0D_Type,          /* tp_base */
+       0,                              /* tp_dict */
+       0,                              /* tp_descr_get */
+       0,                              /* tp_descr_set */
+       0,                              /* tp_dictoffset */
+       (initproc)UnaryFunction0DVectorViewShape___init__, /* tp_init */
+       0,                              /* tp_alloc */
+       0,                              /* tp_new */
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
 
-PyMODINIT_FUNC UnaryFunction0DVectorViewShape_Init( PyObject *module ) {
+int UnaryFunction0DVectorViewShape_Init( PyObject *module ) {
 
        if( module == NULL )
-               return;
+               return -1;
 
        if( PyType_Ready( &UnaryFunction0DVectorViewShape_Type ) < 0 )
-               return;
+               return -1;
        Py_INCREF( &UnaryFunction0DVectorViewShape_Type );
        PyModule_AddObject(module, "UnaryFunction0DVectorViewShape", (PyObject *)&UnaryFunction0DVectorViewShape_Type);
        
        if( PyType_Ready( &GetOccludersF0D_Type ) < 0 )
-               return;
+               return -1;
        Py_INCREF( &GetOccludersF0D_Type );
        PyModule_AddObject(module, "GetOccludersF0D", (PyObject *)&GetOccludersF0D_Type);
-       
+
+       return 0;
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-int UnaryFunction0DVectorViewShape___init__(BPy_UnaryFunction0DVectorViewShape* self)
+int UnaryFunction0DVectorViewShape___init__(BPy_UnaryFunction0DVectorViewShape* self, PyObject *args, PyObject *kwds)
 {
+    if ( !PyArg_ParseTuple(args, "") )
+        return -1;
        self->uf0D_vectorviewshape = new UnaryFunction0D< std::vector<ViewShape*> >();
        self->uf0D_vectorviewshape->py_uf0D = (PyObject *)self;
        return 0;
@@ -141,36 +101,48 @@ int UnaryFunction0DVectorViewShape___init__(BPy_UnaryFunction0DVectorViewShape*
 
 void UnaryFunction0DVectorViewShape___dealloc__(BPy_UnaryFunction0DVectorViewShape* self)
 {
-       delete self->uf0D_vectorviewshape;
+       if (self->uf0D_vectorviewshape)
+               delete self->uf0D_vectorviewshape;
        UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
 }
 
 
 PyObject * UnaryFunction0DVectorViewShape___repr__(BPy_UnaryFunction0DVectorViewShape* self)
 {
-       return PyString_FromFormat("type: %s - address: %p", self->uf0D_vectorviewshape->getName().c_str(), self->uf0D_vectorviewshape );
+       return PyUnicode_FromFormat("type: %s - address: %p", self->uf0D_vectorviewshape->getName().c_str(), self->uf0D_vectorviewshape );
 }
 
 PyObject * UnaryFunction0DVectorViewShape_getName( BPy_UnaryFunction0DVectorViewShape *self )
 {
-       return PyString_FromString( self->uf0D_vectorviewshape->getName().c_str() );
+       return PyUnicode_FromFormat( self->uf0D_vectorviewshape->getName().c_str() );
 }
 
-PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorViewShape *self, PyObject *args)
+PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorViewShape *self, PyObject *args, PyObject *kwds)
 {
        PyObject *obj;
 
-       if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
-               cout << "ERROR: UnaryFunction0DVectorViewShape___call__ " << endl;              
+       if( kwds != NULL ) {
+               PyErr_SetString(PyExc_TypeError, "keyword argument(s) not supported");
+               return NULL;
+       }
+       if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj))
+               return NULL;
+
+       if( typeid(*(self->uf0D_vectorviewshape)) == typeid(UnaryFunction0D< std::vector<ViewShape*> >) ) {
+               PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
+               return NULL;
+       }
+       if (self->uf0D_vectorviewshape->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) < 0) {
+               if (!PyErr_Occurred()) {
+                       string msg(self->uf0D_vectorviewshape->getName() + " __call__ method failed");
+                       PyErr_SetString(PyExc_RuntimeError, msg.c_str());
+               }
                return NULL;
        }
-       
-       
-       std::vector<ViewShape*> vs( self->uf0D_vectorviewshape->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
        PyObject *list = PyList_New(NULL);
        
-       for( unsigned int i = 0; i < vs.size(); i++)
-               PyList_Append(list, BPy_ViewShape_from_ViewShape(*( vs[i] )) );
+       for( unsigned int i = 0; i < self->uf0D_vectorviewshape->result.size(); i++)
+               PyList_Append(list, BPy_ViewShape_from_ViewShape(*( self->uf0D_vectorviewshape->result[i] )) );
        
        return list;
 }