1 files changed, 39 insertions, 56 deletions

diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
index b61b9baf033..34c57e0bbd0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
@@ -24,64 +24,64 @@ extern "C" {
 
 //-------------------MODULE INITIALIZATION--------------------------------
 
-int UnaryFunction0DDouble_Init( PyObject *module ) {
-
-	if( module == NULL )
+int UnaryFunction0DDouble_Init(PyObject *module)
+{
+	if (module == NULL)
 		return -1;
 
-	if( PyType_Ready( &UnaryFunction0DDouble_Type ) < 0 )
+	if (PyType_Ready(&UnaryFunction0DDouble_Type) < 0)
 		return -1;
-	Py_INCREF( &UnaryFunction0DDouble_Type );
+	Py_INCREF(&UnaryFunction0DDouble_Type);
 	PyModule_AddObject(module, "UnaryFunction0DDouble", (PyObject *)&UnaryFunction0DDouble_Type);
 	
-	if( PyType_Ready( &DensityF0D_Type ) < 0 )
+	if (PyType_Ready(&DensityF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &DensityF0D_Type );
+	Py_INCREF(&DensityF0D_Type);
 	PyModule_AddObject(module, "DensityF0D", (PyObject *)&DensityF0D_Type);
 	
-	if( PyType_Ready( &LocalAverageDepthF0D_Type ) < 0 )
+	if (PyType_Ready(&LocalAverageDepthF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &LocalAverageDepthF0D_Type );
+	Py_INCREF(&LocalAverageDepthF0D_Type);
 	PyModule_AddObject(module, "LocalAverageDepthF0D", (PyObject *)&LocalAverageDepthF0D_Type);
 	
-	if( PyType_Ready( &Curvature2DAngleF0D_Type ) < 0 )
+	if (PyType_Ready(&Curvature2DAngleF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &Curvature2DAngleF0D_Type );
+	Py_INCREF(&Curvature2DAngleF0D_Type);
 	PyModule_AddObject(module, "Curvature2DAngleF0D", (PyObject *)&Curvature2DAngleF0D_Type);
 	
-	if( PyType_Ready( &GetProjectedXF0D_Type ) < 0 )
+	if (PyType_Ready(&GetProjectedXF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &GetProjectedXF0D_Type );
+	Py_INCREF(&GetProjectedXF0D_Type);
 	PyModule_AddObject(module, "GetProjectedXF0D", (PyObject *)&GetProjectedXF0D_Type);
 	
-	if( PyType_Ready( &GetProjectedYF0D_Type ) < 0 )
+	if (PyType_Ready(&GetProjectedYF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &GetProjectedYF0D_Type );
+	Py_INCREF(&GetProjectedYF0D_Type);
 	PyModule_AddObject(module, "GetProjectedYF0D", (PyObject *)&GetProjectedYF0D_Type);
 	
-	if( PyType_Ready( &GetProjectedZF0D_Type ) < 0 )
+	if (PyType_Ready(&GetProjectedZF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &GetProjectedZF0D_Type );
+	Py_INCREF(&GetProjectedZF0D_Type);
 	PyModule_AddObject(module, "GetProjectedZF0D", (PyObject *)&GetProjectedZF0D_Type);
 		
-	if( PyType_Ready( &GetXF0D_Type ) < 0 )
+	if (PyType_Ready(&GetXF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &GetXF0D_Type );
+	Py_INCREF(&GetXF0D_Type);
 	PyModule_AddObject(module, "GetXF0D", (PyObject *)&GetXF0D_Type);
 	
-	if( PyType_Ready( &GetYF0D_Type ) < 0 )
+	if (PyType_Ready(&GetYF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &GetYF0D_Type );
+	Py_INCREF(&GetYF0D_Type);
 	PyModule_AddObject(module, "GetYF0D", (PyObject *)&GetYF0D_Type);
 	
-	if( PyType_Ready( &GetZF0D_Type ) < 0 )
+	if (PyType_Ready(&GetZF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &GetZF0D_Type );
+	Py_INCREF(&GetZF0D_Type);
 	PyModule_AddObject(module, "GetZF0D", (PyObject *)&GetZF0D_Type);
 	
-	if( PyType_Ready( &ZDiscontinuityF0D_Type ) < 0 )
+	if (PyType_Ready(&ZDiscontinuityF0D_Type) < 0)
 		return -1;
-	Py_INCREF( &ZDiscontinuityF0D_Type );
+	Py_INCREF(&ZDiscontinuityF0D_Type);
 	PyModule_AddObject(module, "ZDiscontinuityF0D", (PyObject *)&ZDiscontinuityF0D_Type);
 
 	return 0;
@@ -101,8 +101,10 @@ static char UnaryFunction0DDouble___doc__[] =
 
 static int UnaryFunction0DDouble___init__(BPy_UnaryFunction0DDouble* 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_double = new UnaryFunction0D<double>();
 	self->uf0D_double->py_uf0D = (PyObject *)self;
 	return 0;
@@ -117,51 +119,32 @@ static void UnaryFunction0DDouble___dealloc__(BPy_UnaryFunction0DDouble* self)
 
 static PyObject * UnaryFunction0DDouble___repr__(BPy_UnaryFunction0DDouble* self)
 {
-	return PyUnicode_FromFormat("type: %s - address: %p", self->uf0D_double->getName().c_str(), self->uf0D_double );
+	return PyUnicode_FromFormat("type: %s - address: %p", self->uf0D_double->getName().c_str(), self->uf0D_double);
 }
 
-static char UnaryFunction0DDouble_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 * UnaryFunction0DDouble_getName( BPy_UnaryFunction0DDouble *self )
-{
-	return PyUnicode_FromString( self->uf0D_double->getName().c_str() );
-}
-
-static PyObject * UnaryFunction0DDouble___call__( BPy_UnaryFunction0DDouble *self, PyObject *args, PyObject *kwds)
+static PyObject * UnaryFunction0DDouble___call__(BPy_UnaryFunction0DDouble *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_double)) == typeid(UnaryFunction0D<double>) ) {
+
+	if (typeid(*(self->uf0D_double)) == typeid(UnaryFunction0D<double>)) {
 		PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
 		return NULL;
 	}
-	if (self->uf0D_double->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it)) < 0) {
+	if (self->uf0D_double->operator()(*(((BPy_Interface0DIterator *)obj)->if0D_it)) < 0) {
 		if (!PyErr_Occurred()) {
-			string msg(self->uf0D_double->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_double->result );
-
+	return PyFloat_FromDouble(self->uf0D_double->result);
 }
 
-/*----------------------UnaryFunction0DDouble instance definitions ----------------------------*/
 static PyMethodDef BPy_UnaryFunction0DDouble_methods[] = {
-	{"getName", ( PyCFunction ) UnaryFunction0DDouble_getName, METH_NOARGS, UnaryFunction0DDouble_getName___doc__},
 	{NULL, NULL, 0, NULL}
 };