Made the Freestyle Python API compatible with Python 3.
This commit is contained in:
@@ -22,117 +22,76 @@ static PyObject * UnaryFunction0DViewShape___call__( BPy_UnaryFunction0DViewShap
|
||||
|
||||
/*----------------------UnaryFunction0DViewShape instance definitions ----------------------------*/
|
||||
static PyMethodDef BPy_UnaryFunction0DViewShape_methods[] = {
|
||||
{"getName", ( PyCFunction ) UnaryFunction0DViewShape_getName, METH_NOARGS, "( )Returns the string of the name of the unary 0D function."},
|
||||
{"getName", ( PyCFunction ) UnaryFunction0DViewShape_getName, METH_NOARGS, "() Returns the string of the name of the unary 0D function."},
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
/*-----------------------BPy_UnaryFunction0DViewShape type definition ------------------------------*/
|
||||
|
||||
PyTypeObject UnaryFunction0DViewShape_Type = {
|
||||
PyObject_HEAD_INIT( NULL )
|
||||
0, /* ob_size */
|
||||
"UnaryFunction0DViewShape", /* tp_name */
|
||||
sizeof( BPy_UnaryFunction0DViewShape ), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
|
||||
/* methods */
|
||||
(destructor)UnaryFunction0DViewShape___dealloc__, /* tp_dealloc */
|
||||
NULL, /* printfunc tp_print; */
|
||||
NULL, /* getattrfunc tp_getattr; */
|
||||
NULL, /* setattrfunc tp_setattr; */
|
||||
NULL, /* tp_compare */
|
||||
(reprfunc)UnaryFunction0DViewShape___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; */
|
||||
(ternaryfunc)UnaryFunction0DViewShape___call__, /* 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_UnaryFunction0DViewShape_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)UnaryFunction0DViewShape___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)
|
||||
"UnaryFunction0DViewShape", /* tp_name */
|
||||
sizeof(BPy_UnaryFunction0DViewShape), /* tp_basicsize */
|
||||
0, /* tp_itemsize */
|
||||
(destructor)UnaryFunction0DViewShape___dealloc__, /* tp_dealloc */
|
||||
0, /* tp_print */
|
||||
0, /* tp_getattr */
|
||||
0, /* tp_setattr */
|
||||
0, /* tp_reserved */
|
||||
(reprfunc)UnaryFunction0DViewShape___repr__, /* tp_repr */
|
||||
0, /* tp_as_number */
|
||||
0, /* tp_as_sequence */
|
||||
0, /* tp_as_mapping */
|
||||
0, /* tp_hash */
|
||||
(ternaryfunc)UnaryFunction0DViewShape___call__, /* tp_call */
|
||||
0, /* tp_str */
|
||||
0, /* tp_getattro */
|
||||
0, /* tp_setattro */
|
||||
0, /* tp_as_buffer */
|
||||
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
||||
"UnaryFunction0DViewShape objects", /* tp_doc */
|
||||
0, /* tp_traverse */
|
||||
0, /* tp_clear */
|
||||
0, /* tp_richcompare */
|
||||
0, /* tp_weaklistoffset */
|
||||
0, /* tp_iter */
|
||||
0, /* tp_iternext */
|
||||
BPy_UnaryFunction0DViewShape_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)UnaryFunction0DViewShape___init__, /* tp_init */
|
||||
0, /* tp_alloc */
|
||||
0, /* tp_new */
|
||||
};
|
||||
|
||||
//-------------------MODULE INITIALIZATION--------------------------------
|
||||
|
||||
PyMODINIT_FUNC UnaryFunction0DViewShape_Init( PyObject *module ) {
|
||||
int UnaryFunction0DViewShape_Init( PyObject *module ) {
|
||||
|
||||
if( module == NULL )
|
||||
return;
|
||||
return -1;
|
||||
|
||||
if( PyType_Ready( &UnaryFunction0DViewShape_Type ) < 0 )
|
||||
return;
|
||||
return -1;
|
||||
Py_INCREF( &UnaryFunction0DViewShape_Type );
|
||||
PyModule_AddObject(module, "UnaryFunction0DViewShape", (PyObject *)&UnaryFunction0DViewShape_Type);
|
||||
|
||||
if( PyType_Ready( &GetOccludeeF0D_Type ) < 0 )
|
||||
return;
|
||||
return -1;
|
||||
Py_INCREF( &GetOccludeeF0D_Type );
|
||||
PyModule_AddObject(module, "GetOccludeeF0D", (PyObject *)&GetOccludeeF0D_Type);
|
||||
|
||||
if( PyType_Ready( &GetShapeF0D_Type ) < 0 )
|
||||
return;
|
||||
return -1;
|
||||
Py_INCREF( &GetShapeF0D_Type );
|
||||
PyModule_AddObject(module, "GetShapeF0D", (PyObject *)&GetShapeF0D_Type);
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
//------------------------INSTANCE METHODS ----------------------------------
|
||||
@@ -156,12 +115,12 @@ void UnaryFunction0DViewShape___dealloc__(BPy_UnaryFunction0DViewShape* self)
|
||||
|
||||
PyObject * UnaryFunction0DViewShape___repr__(BPy_UnaryFunction0DViewShape* self)
|
||||
{
|
||||
return PyString_FromFormat("type: %s - address: %p", self->uf0D_viewshape->getName().c_str(), self->uf0D_viewshape );
|
||||
return PyUnicode_FromFormat("type: %s - address: %p", self->uf0D_viewshape->getName().c_str(), self->uf0D_viewshape );
|
||||
}
|
||||
|
||||
PyObject * UnaryFunction0DViewShape_getName( BPy_UnaryFunction0DViewShape *self )
|
||||
{
|
||||
return PyString_FromString( self->uf0D_viewshape->getName().c_str() );
|
||||
return PyUnicode_FromFormat( self->uf0D_viewshape->getName().c_str() );
|
||||
}
|
||||
|
||||
PyObject * UnaryFunction0DViewShape___call__( BPy_UnaryFunction0DViewShape *self, PyObject *args, PyObject *kwds)
|
||||
|
||||
Reference in New Issue
Block a user