Made the Freestyle Python API compatible with Python 3.
[blender.git] / source / blender / freestyle / intern / python / Iterator / BPy_StrokeVertexIterator.cpp
index 25caf684b5948cb6e062b3e80dd3323cc52097e3..8ca23a94461e3f171038d047c8318ddcf66b85d2 100644 (file)
@@ -21,8 +21,8 @@ static PyObject * StrokeVertexIterator_getObject( BPy_StrokeVertexIterator *self
 
 /*----------------------StrokeVertexIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_StrokeVertexIterator_methods[] = {
-       {"t", ( PyCFunction ) StrokeVertexIterator_t, METH_NOARGS, "( )Returns the curvilinear abscissa."},
-       {"u", ( PyCFunction ) StrokeVertexIterator_u, METH_NOARGS, "( )Returns the point parameter in the curve 0<=u<=1."},
+       {"t", ( PyCFunction ) StrokeVertexIterator_t, METH_NOARGS, "() Returns the curvilinear abscissa."},
+       {"u", ( PyCFunction ) StrokeVertexIterator_u, METH_NOARGS, "() Returns the point parameter in the curve 0<=u<=1."},
        {"castToInterface0DIterator", ( PyCFunction ) StrokeVertexIterator_castToInterface0DIterator, METH_NOARGS, "() Casts this StrokeVertexIterator into an Interface0DIterator. Useful for any call to a function of the type UnaryFunction0D."},
        {"getObject", ( PyCFunction ) StrokeVertexIterator_getObject, METH_NOARGS, "() Get object referenced by the iterator"},
        {NULL, NULL, 0, NULL}
@@ -31,91 +31,46 @@ static PyMethodDef BPy_StrokeVertexIterator_methods[] = {
 /*-----------------------BPy_StrokeVertexIterator type definition ------------------------------*/
 
 PyTypeObject StrokeVertexIterator_Type = {
-       PyObject_HEAD_INIT( NULL ) 
-       0,                                                      /* ob_size */
-       "StrokeVertexIterator",                         /* tp_name */
-       sizeof( BPy_StrokeVertexIterator ),     /* tp_basicsize */
-       0,                                                      /* tp_itemsize */
-       
-       /* methods */
-       NULL,   /* tp_dealloc */
-       NULL,                                                   /* printfunc tp_print; */
-       NULL,                                                   /* getattrfunc tp_getattr; */
-       NULL,                                                   /* setattrfunc tp_setattr; */
-       NULL,                                                                           /* tp_compare */
-       NULL,                                   /* 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 */
-       PyObject_SelfIter,                              /* getiterfunc tp_iter; */
-       (iternextfunc)StrokeVertexIterator_iternext,    /* iternextfunc tp_iternext; */
-
-  /*** Attribute descriptor and subclassing stuff ***/
-       BPy_StrokeVertexIterator_methods,       /* struct PyMethodDef *tp_methods; */
-       NULL,                           /* struct PyMemberDef *tp_members; */
-       NULL,                                           /* struct PyGetSetDef *tp_getset; */
-       &Iterator_Type,                         /* struct _typeobject *tp_base; */
-       NULL,                                                   /* PyObject *tp_dict; */
-       NULL,                                                   /* descrgetfunc tp_descr_get; */
-       NULL,                                                   /* descrsetfunc tp_descr_set; */
-       0,                              /* long tp_dictoffset; */
-       (initproc)StrokeVertexIterator___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
+       PyObject_HEAD_INIT(NULL)
+       "StrokeVertexIterator",         /* tp_name */
+       sizeof(BPy_StrokeVertexIterator), /* tp_basicsize */
+       0,                              /* tp_itemsize */
+       0,                              /* tp_dealloc */
+       0,                              /* tp_print */
+       0,                              /* tp_getattr */
+       0,                              /* tp_setattr */
+       0,                              /* tp_reserved */
+       0,                              /* tp_repr */
+       0,                              /* tp_as_number */
+       0,                              /* tp_as_sequence */
+       0,                              /* tp_as_mapping */
+       0,                              /* tp_hash  */
+       0,                              /* tp_call */
+       0,                              /* tp_str */
+       0,                              /* tp_getattro */
+       0,                              /* tp_setattro */
+       0,                              /* tp_as_buffer */
+       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+       "StrokeVertexIterator objects", /* tp_doc */
+       0,                              /* tp_traverse */
+       0,                              /* tp_clear */
+       0,                              /* tp_richcompare */
+       0,                              /* tp_weaklistoffset */
+       PyObject_SelfIter,              /* tp_iter */
+       (iternextfunc)StrokeVertexIterator_iternext, /* tp_iternext */
+       BPy_StrokeVertexIterator_methods, /* tp_methods */
+       0,                              /* tp_members */
+       0,                              /* tp_getset */
+       &Iterator_Type,                 /* tp_base */
+       0,                              /* tp_dict */
+       0,                              /* tp_descr_get */
+       0,                              /* tp_descr_set */
+       0,                              /* tp_dictoffset */
+       (initproc)StrokeVertexIterator___init__, /* tp_init */
+       0,                              /* tp_alloc */
+       0,                              /* tp_new */
 };
 
-//-------------------MODULE INITIALIZATION--------------------------------
-
-
 //------------------------INSTANCE METHODS ----------------------------------
 
 int StrokeVertexIterator___init__(BPy_StrokeVertexIterator *self, PyObject *args )