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, 20 insertions, 36 deletions

diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
index 3c4ccdbcbf1..a7a67710869 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
@@ -13,19 +13,19 @@ extern "C" {
 
 //-------------------MODULE INITIALIZATION--------------------------------
 
-int UnaryFunction0DId_Init( PyObject *module ) {
-
-	if( module == NULL )
+int UnaryFunction0DId_Init(PyObject *module)
+{
+	if (module == NULL)
 		return -1;
 
-	if( PyType_Ready( &UnaryFunction0DId_Type ) < 0 )
+	if (PyType_Ready(&UnaryFunction0DId_Type) < 0)
 		return -1;
-	Py_INCREF( &UnaryFunction0DId_Type );
+	Py_INCREF(&UnaryFunction0DId_Type);
 	PyModule_AddObject(module, "UnaryFunction0DId", (PyObject *)&UnaryFunction0DId_Type);
 	
-	if( PyType_Ready( &ShapeIdF0D_Type ) < 0 )
+	if (PyType_Ready(&ShapeIdF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &ShapeIdF0D_Type );
+	Py_INCREF(&ShapeIdF0D_Type);
 	PyModule_AddObject(module, "ShapeIdF0D", (PyObject *)&ShapeIdF0D_Type);
 
 	return 0;
@@ -45,8 +45,10 @@ static char UnaryFunction0DId___doc__[] =
 
 static int UnaryFunction0DId___init__(BPy_UnaryFunction0DId* 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_id = new UnaryFunction0D<Id>();
 	self->uf0D_id->py_uf0D = (PyObject *)self;
 	return 0;
@@ -61,50 +63,32 @@ static void UnaryFunction0DId___dealloc__(BPy_UnaryFunction0DId* self)
 
 static PyObject * UnaryFunction0DId___repr__(BPy_UnaryFunction0DId* self)
 {
-	return PyUnicode_FromFormat("type: %s - address: %p", self->uf0D_id->getName().c_str(), self->uf0D_id );
-}
-
-static char UnaryFunction0DId_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 * UnaryFunction0DId_getName( BPy_UnaryFunction0DId *self )
-{
-	return PyUnicode_FromString( self->uf0D_id->getName().c_str() );
+	return PyUnicode_FromFormat("type: %s - address: %p", self->uf0D_id->getName().c_str(), self->uf0D_id);
 }
 
-static PyObject * UnaryFunction0DId___call__( BPy_UnaryFunction0DId *self, PyObject *args, PyObject *kwds)
+static PyObject * UnaryFunction0DId___call__(BPy_UnaryFunction0DId *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_id)) == typeid(UnaryFunction0D<Id>) ) {
+	if (typeid(*(self->uf0D_id)) == typeid(UnaryFunction0D<Id>)) {
 		PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
 		return NULL;
 	}
-	if (self->uf0D_id->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) < 0) {
+	if (self->uf0D_id->operator()(*(((BPy_Interface0DIterator *)obj)->if0D_it)) < 0) {
 		if (!PyErr_Occurred()) {
-			string msg(self->uf0D_id->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 BPy_Id_from_Id( self->uf0D_id->result );
+	return BPy_Id_from_Id(self->uf0D_id->result);
 }
 
-/*----------------------UnaryFunction0DId instance definitions ----------------------------*/
 static PyMethodDef BPy_UnaryFunction0DId_methods[] = {
-	{"getName", ( PyCFunction ) UnaryFunction0DId_getName, METH_NOARGS, UnaryFunction0DId_getName___doc__},
 	{NULL, NULL, 0, NULL}
 };