Made the Freestyle Python API compatible with Python 3.
[blender.git] / source / blender / freestyle / intern / python / Interface0D / BPy_ViewVertex.cpp
index bd2892fa91aa8e00528399bf3c3fa3153c734486..3dcd7f55bbfbe4f895e9e6d86495df0e7b8245b2 100644 (file)
@@ -19,7 +19,7 @@ static PyObject * ViewVertex_edgesIterator( BPy_ViewVertex *self, PyObject *args
 
 /*----------------------ViewVertex instance definitions ----------------------------*/
 static PyMethodDef BPy_ViewVertex_methods[] = {
-       {"setNature", ( PyCFunction ) ViewVertex_setNature, METH_VARARGS, "(Nature n )Sets the nature of the vertex."},
+       {"setNature", ( PyCFunction ) ViewVertex_setNature, METH_VARARGS, "(Nature n) Sets the nature of the vertex."},
        {"edgesBegin", ( PyCFunction ) ViewVertex_edgesBegin, METH_NOARGS, "() Returns an iterator over the ViewEdges that goes to or comes from this ViewVertex pointing to the first ViewEdge of the list. The orientedViewEdgeIterator allows to iterate in CCW order over these ViewEdges and to get the orientation for each ViewEdge (incoming/outgoing). "},
        {"edgesEnd", ( PyCFunction ) ViewVertex_edgesEnd, METH_NOARGS, "() Returns an orientedViewEdgeIterator over the ViewEdges around this ViewVertex, pointing after the last ViewEdge."},
        {"edgesIterator", ( PyCFunction ) ViewVertex_edgesIterator, METH_VARARGS, "(ViewEdge ve) Returns an orientedViewEdgeIterator pointing to the ViewEdge given as argument. "},
@@ -29,91 +29,46 @@ static PyMethodDef BPy_ViewVertex_methods[] = {
 /*-----------------------BPy_ViewVertex type definition ------------------------------*/
 
 PyTypeObject ViewVertex_Type = {
-       PyObject_HEAD_INIT( NULL ) 
-       0,                                                      /* ob_size */
-       "ViewVertex",                           /* tp_name */
-       sizeof( BPy_ViewVertex ),       /* 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 */
-       NULL,                       /* getiterfunc tp_iter; */
-       NULL,                       /* iternextfunc tp_iternext; */
-
-  /*** Attribute descriptor and subclassing stuff ***/
-       BPy_ViewVertex_methods, /* struct PyMethodDef *tp_methods; */
-       NULL,                           /* struct PyMemberDef *tp_members; */
-       NULL,                                           /* struct PyGetSetDef *tp_getset; */
-       &Interface0D_Type,                              /* struct _typeobject *tp_base; */
-       NULL,                                                   /* PyObject *tp_dict; */
-       NULL,                                                   /* descrgetfunc tp_descr_get; */
-       NULL,                                                   /* descrsetfunc tp_descr_set; */
-       0,                              /* long tp_dictoffset; */
-       (initproc)ViewVertex___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)
+       "ViewVertex",                   /* tp_name */
+       sizeof(BPy_ViewVertex),         /* 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 */
+       "ViewVertex objects",           /* tp_doc */
+       0,                              /* tp_traverse */
+       0,                              /* tp_clear */
+       0,                              /* tp_richcompare */
+       0,                              /* tp_weaklistoffset */
+       0,                              /* tp_iter */
+       0,                              /* tp_iternext */
+       BPy_ViewVertex_methods,         /* tp_methods */
+       0,                              /* tp_members */
+       0,                              /* tp_getset */
+       &Interface0D_Type,              /* tp_base */
+       0,                              /* tp_dict */
+       0,                              /* tp_descr_get */
+       0,                              /* tp_descr_set */
+       0,                              /* tp_dictoffset */
+       (initproc)ViewVertex___init__,  /* tp_init */
+       0,                              /* tp_alloc */
+       0,                              /* tp_new */
 };
 
-//-------------------MODULE INITIALIZATION--------------------------------
-
-
 //------------------------INSTANCE METHODS ----------------------------------
 
 int ViewVertex___init__( BPy_ViewVertex *self, PyObject *args, PyObject *kwds )
@@ -138,7 +93,7 @@ PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) {
                return NULL;
        
        PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
-       ((ViewVertex *) self->py_if0D.if0D)->setNature( PyInt_AsLong(i) );
+       ((ViewVertex *) self->py_if0D.if0D)->setNature( PyLong_AsLong(i) );
 
        Py_RETURN_NONE;
 }