Freestyle Python API improvements - part 6.

Fix for PyGetSetDef and proper handling of keyword arguments were done in
Function0D and Function1D classes.  Additional code clean-up was also made.

1 files changed, 30 insertions, 47 deletions

diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
index 72ca2acf3b7..f2707bf3ae8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
@@ -18,44 +18,44 @@ extern "C" {
 
 //-------------------MODULE INITIALIZATION--------------------------------
 
-int UnaryFunction0DFloat_Init( PyObject *module ) {
-
-	if( module == NULL )
+int UnaryFunction0DFloat_Init(PyObject *module)
+{
+	if (module == NULL)
 		return -1;
 
-	if( PyType_Ready( &UnaryFunction0DFloat_Type ) < 0 )
+	if (PyType_Ready(&UnaryFunction0DFloat_Type) < 0)
 		return -1;
-	Py_INCREF( &UnaryFunction0DFloat_Type );
+	Py_INCREF(&UnaryFunction0DFloat_Type);
 	PyModule_AddObject(module, "UnaryFunction0DFloat", (PyObject *)&UnaryFunction0DFloat_Type);
 	
-	if( PyType_Ready( &GetCurvilinearAbscissaF0D_Type ) < 0 )
+	if (PyType_Ready(&GetCurvilinearAbscissaF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &GetCurvilinearAbscissaF0D_Type );
+	Py_INCREF(&GetCurvilinearAbscissaF0D_Type);
 	PyModule_AddObject(module, "GetCurvilinearAbscissaF0D", (PyObject *)&GetCurvilinearAbscissaF0D_Type);
 	
-	if( PyType_Ready( &GetParameterF0D_Type ) < 0 )
+	if (PyType_Ready(&GetParameterF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &GetParameterF0D_Type );
+	Py_INCREF(&GetParameterF0D_Type);
 	PyModule_AddObject(module, "GetParameterF0D", (PyObject *)&GetParameterF0D_Type);
 		
-	if( PyType_Ready( &GetViewMapGradientNormF0D_Type ) < 0 )
+	if (PyType_Ready(&GetViewMapGradientNormF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &GetViewMapGradientNormF0D_Type );
+	Py_INCREF(&GetViewMapGradientNormF0D_Type);
 	PyModule_AddObject(module, "GetViewMapGradientNormF0D", (PyObject *)&GetViewMapGradientNormF0D_Type);
 	
-	if( PyType_Ready( &ReadCompleteViewMapPixelF0D_Type ) < 0 )
+	if (PyType_Ready(&ReadCompleteViewMapPixelF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &ReadCompleteViewMapPixelF0D_Type );
+	Py_INCREF(&ReadCompleteViewMapPixelF0D_Type);
 	PyModule_AddObject(module, "ReadCompleteViewMapPixelF0D", (PyObject *)&ReadCompleteViewMapPixelF0D_Type);
 	
-	if( PyType_Ready( &ReadMapPixelF0D_Type ) < 0 )
+	if (PyType_Ready(&ReadMapPixelF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &ReadMapPixelF0D_Type );
+	Py_INCREF(&ReadMapPixelF0D_Type);
 	PyModule_AddObject(module, "ReadMapPixelF0D", (PyObject *)&ReadMapPixelF0D_Type);
 	
-	if( PyType_Ready( &ReadSteerableViewMapPixelF0D_Type ) < 0 )
+	if (PyType_Ready(&ReadSteerableViewMapPixelF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &ReadSteerableViewMapPixelF0D_Type );
+	Py_INCREF(&ReadSteerableViewMapPixelF0D_Type);
 	PyModule_AddObject(module, "ReadSteerableViewMapPixelF0D", (PyObject *)&ReadSteerableViewMapPixelF0D_Type);
 
 	return 0;
@@ -75,8 +75,10 @@ static char UnaryFunction0DFloat___doc__[] =
 
 static int UnaryFunction0DFloat___init__(BPy_UnaryFunction0DFloat* self, PyObject *args, PyObject *kwds)
 {
-    if ( !PyArg_ParseTuple(args, "") )
-        return -1;
+	static const char *kwlist[] = {NULL};
+
+	if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
+		return -1;
 	self->uf0D_float = new UnaryFunction0D<float>();
 	self->uf0D_float->py_uf0D = (PyObject *)self;
 	return 0;
@@ -91,51 +93,32 @@ static void UnaryFunction0DFloat___dealloc__(BPy_UnaryFunction0DFloat* self)
 
 static PyObject * UnaryFunction0DFloat___repr__(BPy_UnaryFunction0DFloat* self)
 {
-	return PyUnicode_FromFormat("type: %s - address: %p", self->uf0D_float->getName().c_str(), self->uf0D_float );
+	return PyUnicode_FromFormat("type: %s - address: %p", self->uf0D_float->getName().c_str(), self->uf0D_float);
 }
 
-static char UnaryFunction0DFloat_getName___doc__[] =
-".. method:: getName()\n"
-"\n"
-"   Returns the name of the unary 0D predicate.\n"
-"\n"
-"   :return: The name of the unary 0D predicate.\n"
-"   :rtype: str\n";
-
-static PyObject * UnaryFunction0DFloat_getName( BPy_UnaryFunction0DFloat *self )
-{
-	return PyUnicode_FromString( self->uf0D_float->getName().c_str() );
-}
-
-static PyObject * UnaryFunction0DFloat___call__( BPy_UnaryFunction0DFloat *self, PyObject *args, PyObject *kwds)
+static PyObject * UnaryFunction0DFloat___call__(BPy_UnaryFunction0DFloat *self, PyObject *args, PyObject *kwds)
 {
+	static const char *kwlist[] = {"it", NULL};
 	PyObject *obj;
 
-	if( kwds != NULL ) {
-		PyErr_SetString(PyExc_TypeError, "keyword argument(s) not supported");
-		return NULL;
-	}
-	if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj))
+	if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Interface0DIterator_Type, &obj))
 		return NULL;
 	
-	if( typeid(*(self->uf0D_float)) == typeid(UnaryFunction0D<float>) ) {
+	if (typeid(*(self->uf0D_float)) == typeid(UnaryFunction0D<float>)) {
 		PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
 		return NULL;
 	}
-	if (self->uf0D_float->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) < 0) {
+	if (self->uf0D_float->operator()(*(((BPy_Interface0DIterator *)obj)->if0D_it)) < 0) {
 		if (!PyErr_Occurred()) {
-			string msg(self->uf0D_float->getName() + " __call__ method failed");
-			PyErr_SetString(PyExc_RuntimeError, msg.c_str());
+			string class_name(Py_TYPE(self)->tp_name);
+			PyErr_SetString(PyExc_RuntimeError, (class_name + " __call__ method failed").c_str());
 		}
 		return NULL;
 	}
-	return PyFloat_FromDouble( self->uf0D_float->result );
-
+	return PyFloat_FromDouble(self->uf0D_float->result);
 }
 
-/*----------------------UnaryFunction0DFloat instance definitions ----------------------------*/
 static PyMethodDef BPy_UnaryFunction0DFloat_methods[] = {
-	{"getName", ( PyCFunction ) UnaryFunction0DFloat_getName, METH_NOARGS, UnaryFunction0DFloat_getName___doc__},
 	{NULL, NULL, 0, NULL}
 };