There was a known issue for a long time that we occasionally encountered strange "TypeError: an integer is required" and "RuntimeWarning: tp_compare didn't return -1 or -2 for exception", as shown in the following unit test log. The source of the former error was PyInt_AsLong(obj) being used by IntegrationType_from_BPy_IntegrationType(obj), where "obj" was not properly initialized in "__init__" before the converter was called. The TypeError was left unattended for a while and showed up when a comparison occurred and the TypeError was detected, which resulted in the latter warning. > runTest (__main__.UnaryFunction1DDoubleInitTestCase) ... > .\blender:211: RuntimeWarning: tp_compare didn't return -1 or -2 for exception > ERROR > > ====================================================================== > ERROR: runTest (__main__.UnaryFunction1DDoubleInitTestCase) > ---------------------------------------------------------------------- > Traceback (most recent call last): > File "init_tests.py", line 211, in runTest > TypeError: an integer is required > > ---------------------------------------------------------------------- * Also removed unnecessary error messages in "__init__" methods of UnaryFunction1D types.
213 lines
7.7 KiB
C++
213 lines
7.7 KiB
C++
#include "BPy_UnaryFunction1DFloat.h"
|
||
|
||
#include "../BPy_Convert.h"
|
||
#include "../BPy_Interface1D.h"
|
||
#include "../BPy_IntegrationType.h"
|
||
|
||
#ifdef __cplusplus
|
||
extern "C" {
|
||
#endif
|
||
|
||
///////////////////////////////////////////////////////////////////////////////////////////
|
||
|
||
/*--------------- Python API function prototypes for UnaryFunction1DFloat instance -----------*/
|
||
static int UnaryFunction1DFloat___init__(BPy_UnaryFunction1DFloat* self, PyObject *args);
|
||
static void UnaryFunction1DFloat___dealloc__(BPy_UnaryFunction1DFloat* self);
|
||
static PyObject * UnaryFunction1DFloat___repr__(BPy_UnaryFunction1DFloat* self);
|
||
|
||
static PyObject * UnaryFunction1DFloat_getName( BPy_UnaryFunction1DFloat *self);
|
||
static PyObject * UnaryFunction1DFloat___call__( BPy_UnaryFunction1DFloat *self, PyObject *args, PyObject *kwds);
|
||
static PyObject * UnaryFunction1DFloat_setIntegrationType(BPy_UnaryFunction1DFloat* self, PyObject *args);
|
||
static PyObject * UnaryFunction1DFloat_getIntegrationType(BPy_UnaryFunction1DFloat* self);
|
||
|
||
/*----------------------UnaryFunction1DFloat instance definitions ----------------------------*/
|
||
static PyMethodDef BPy_UnaryFunction1DFloat_methods[] = {
|
||
{"getName", ( PyCFunction ) UnaryFunction1DFloat_getName, METH_NOARGS, "( )Returns the string of the name of the unary 1D function."},
|
||
{"setIntegrationType", ( PyCFunction ) UnaryFunction1DFloat_setIntegrationType, METH_VARARGS, "(IntegrationType i )Sets the integration method" },
|
||
{"getIntegrationType", ( PyCFunction ) UnaryFunction1DFloat_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
|
||
{NULL, NULL, 0, NULL}
|
||
};
|
||
|
||
/*-----------------------BPy_UnaryFunction1DFloat type definition ------------------------------*/
|
||
|
||
PyTypeObject UnaryFunction1DFloat_Type = {
|
||
PyObject_HEAD_INIT( NULL )
|
||
0, /* ob_size */
|
||
"UnaryFunction1DFloat", /* tp_name */
|
||
sizeof( BPy_UnaryFunction1DFloat ), /* tp_basicsize */
|
||
0, /* tp_itemsize */
|
||
|
||
/* methods */
|
||
(destructor)UnaryFunction1DFloat___dealloc__, /* tp_dealloc */
|
||
NULL, /* printfunc tp_print; */
|
||
NULL, /* getattrfunc tp_getattr; */
|
||
NULL, /* setattrfunc tp_setattr; */
|
||
NULL, /* tp_compare */
|
||
(reprfunc)UnaryFunction1DFloat___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)UnaryFunction1DFloat___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_UnaryFunction1DFloat_methods, /* struct PyMethodDef *tp_methods; */
|
||
NULL, /* struct PyMemberDef *tp_members; */
|
||
NULL, /* struct PyGetSetDef *tp_getset; */
|
||
&UnaryFunction1D_Type, /* struct _typeobject *tp_base; */
|
||
NULL, /* PyObject *tp_dict; */
|
||
NULL, /* descrgetfunc tp_descr_get; */
|
||
NULL, /* descrsetfunc tp_descr_set; */
|
||
0, /* long tp_dictoffset; */
|
||
(initproc)UnaryFunction1DFloat___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
|
||
};
|
||
|
||
//-------------------MODULE INITIALIZATION--------------------------------
|
||
|
||
PyMODINIT_FUNC UnaryFunction1DFloat_Init( PyObject *module ) {
|
||
|
||
if( module == NULL )
|
||
return;
|
||
|
||
if( PyType_Ready( &UnaryFunction1DFloat_Type ) < 0 )
|
||
return;
|
||
Py_INCREF( &UnaryFunction1DFloat_Type );
|
||
PyModule_AddObject(module, "UnaryFunction1DFloat", (PyObject *)&UnaryFunction1DFloat_Type);
|
||
|
||
}
|
||
|
||
//------------------------INSTANCE METHODS ----------------------------------
|
||
|
||
int UnaryFunction1DFloat___init__(BPy_UnaryFunction1DFloat* self, PyObject *args)
|
||
{
|
||
PyObject *obj = 0;
|
||
|
||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) )
|
||
return -1;
|
||
|
||
if( !obj )
|
||
self->uf1D_float = new UnaryFunction1D<float>();
|
||
else {
|
||
self->uf1D_float = new UnaryFunction1D<float>( IntegrationType_from_BPy_IntegrationType(obj) );
|
||
}
|
||
|
||
self->uf1D_float->py_uf1D = (PyObject *)self;
|
||
|
||
return 0;
|
||
}
|
||
void UnaryFunction1DFloat___dealloc__(BPy_UnaryFunction1DFloat* self)
|
||
{
|
||
if (self->uf1D_float)
|
||
delete self->uf1D_float;
|
||
UnaryFunction1D_Type.tp_dealloc((PyObject*)self);
|
||
}
|
||
|
||
|
||
PyObject * UnaryFunction1DFloat___repr__(BPy_UnaryFunction1DFloat* self)
|
||
{
|
||
return PyString_FromFormat("type: %s - address: %p", self->uf1D_float->getName().c_str(), self->uf1D_float );
|
||
}
|
||
|
||
PyObject * UnaryFunction1DFloat_getName( BPy_UnaryFunction1DFloat *self )
|
||
{
|
||
return PyString_FromString( self->uf1D_float->getName().c_str() );
|
||
}
|
||
|
||
PyObject * UnaryFunction1DFloat___call__( BPy_UnaryFunction1DFloat *self, PyObject *args, PyObject *kwds)
|
||
{
|
||
PyObject *obj;
|
||
|
||
if( kwds != NULL ) {
|
||
PyErr_SetString(PyExc_TypeError, "keyword argument(s) not supported");
|
||
return NULL;
|
||
}
|
||
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) )
|
||
return NULL;
|
||
|
||
if( typeid(*(self->uf1D_float)) == typeid(UnaryFunction1D<float>) ) {
|
||
PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
|
||
return NULL;
|
||
}
|
||
if (self->uf1D_float->operator()(*( ((BPy_Interface1D *) obj)->if1D )) < 0) {
|
||
if (!PyErr_Occurred()) {
|
||
string msg(self->uf1D_float->getName() + " __call__ method failed");
|
||
PyErr_SetString(PyExc_RuntimeError, msg.c_str());
|
||
}
|
||
return NULL;
|
||
}
|
||
return PyFloat_FromDouble( self->uf1D_float->result );
|
||
|
||
}
|
||
|
||
PyObject * UnaryFunction1DFloat_setIntegrationType(BPy_UnaryFunction1DFloat* self, PyObject *args)
|
||
{
|
||
PyObject *obj;
|
||
|
||
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) )
|
||
return NULL;
|
||
|
||
self->uf1D_float->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
|
||
Py_RETURN_NONE;
|
||
}
|
||
|
||
PyObject * UnaryFunction1DFloat_getIntegrationType(BPy_UnaryFunction1DFloat* self) {
|
||
return BPy_IntegrationType_from_IntegrationType( self->uf1D_float->getIntegrationType() );
|
||
}
|
||
|
||
///////////////////////////////////////////////////////////////////////////////////////////
|
||
|
||
#ifdef __cplusplus
|
||
}
|
||
#endif
|