Made the Freestyle Python API compatible with Python 3.
[blender.git] / source / blender / freestyle / intern / python / BPy_StrokeAttribute.cpp
index 2c9512792fac9e7e5ba289ec812c768c169039ac..30fb7a5c2e38bb97a9a0d3daede9118441b262fd 100644 (file)
@@ -69,99 +69,57 @@ static PyMethodDef BPy_StrokeAttribute_methods[] = {
 /*-----------------------BPy_StrokeAttribute type definition ------------------------------*/
 
 PyTypeObject StrokeAttribute_Type = {
-       PyObject_HEAD_INIT( NULL ) 
-       0,                                                      /* ob_size */
-       "StrokeAttribute",                              /* tp_name */
-       sizeof( BPy_StrokeAttribute ),  /* tp_basicsize */
-       0,                                                      /* tp_itemsize */
-       
-       /* methods */
-       (destructor)StrokeAttribute___dealloc__,        /* tp_dealloc */
-       NULL,                                                   /* printfunc tp_print; */
-       NULL,                                                   /* getattrfunc tp_getattr; */
-       NULL,                                                   /* setattrfunc tp_setattr; */
-       NULL,                                                                           /* tp_compare */
-       (reprfunc)StrokeAttribute___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_StrokeAttribute_methods,    /* struct PyMethodDef *tp_methods; */
-       NULL,                           /* struct PyMemberDef *tp_members; */
-       NULL,                                                   /* struct PyGetSetDef *tp_getset; */
-       NULL,                                                   /* struct _typeobject *tp_base; */
-       NULL,                                                   /* PyObject *tp_dict; */
-       NULL,                                                   /* descrgetfunc tp_descr_get; */
-       NULL,                                                   /* descrsetfunc tp_descr_set; */
-       0,                              /* long tp_dictoffset; */
-       (initproc)StrokeAttribute___init__,                             /* initproc tp_init; */
-       NULL,                                                   /* allocfunc tp_alloc; */
-       PyType_GenericNew,              /* 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)
+       "StrokeAttribute",              /* tp_name */
+       sizeof(BPy_StrokeAttribute),    /* tp_basicsize */
+       0,                              /* tp_itemsize */
+       (destructor)StrokeAttribute___dealloc__, /* tp_dealloc */
+       0,                              /* tp_print */
+       0,                              /* tp_getattr */
+       0,                              /* tp_setattr */
+       0,                              /* tp_reserved */
+       (reprfunc)StrokeAttribute___repr__, /* 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 */
+       "StrokeAttribute objects",      /* tp_doc */
+       0,                              /* tp_traverse */
+       0,                              /* tp_clear */
+       0,                              /* tp_richcompare */
+       0,                              /* tp_weaklistoffset */
+       0,                              /* tp_iter */
+       0,                              /* tp_iternext */
+       BPy_StrokeAttribute_methods,    /* tp_methods */
+       0,                              /* tp_members */
+       0,                              /* tp_getset */
+       0,                              /* tp_base */
+       0,                              /* tp_dict */
+       0,                              /* tp_descr_get */
+       0,                              /* tp_descr_set */
+       0,                              /* tp_dictoffset */
+       (initproc)StrokeAttribute___init__, /* tp_init */
+       0,                              /* tp_alloc */
+       PyType_GenericNew,              /* tp_new */
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyMODINIT_FUNC StrokeAttribute_Init( PyObject *module )
+int StrokeAttribute_Init( PyObject *module )
 {
        if( module == NULL )
-               return;
+               return -1;
 
        if( PyType_Ready( &StrokeAttribute_Type ) < 0 )
-               return;
+               return -1;
        Py_INCREF( &StrokeAttribute_Type );
        PyModule_AddObject(module, "StrokeAttribute", (PyObject *)&StrokeAttribute_Type);
-       
+       return 0;
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
@@ -210,7 +168,7 @@ void StrokeAttribute___dealloc__(BPy_StrokeAttribute* self)
 {
        if( self->sa && !self->borrowed )
                delete self->sa;
-    self->ob_type->tp_free((PyObject*)self);
+    Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
 PyObject * StrokeAttribute___repr__(BPy_StrokeAttribute* self)
@@ -223,7 +181,7 @@ PyObject * StrokeAttribute___repr__(BPy_StrokeAttribute* self)
                 << " - R: " << self->sa->getThicknessR() 
                 << " L: " << self->sa->getThicknessL();
 
-       return PyString_FromFormat( repr.str().c_str() );
+       return PyUnicode_FromFormat( repr.str().c_str() );
 }