BGE Python API

* fixed segfaults in CListValue.index(val) and CListValue.count(val) when the pyTypes could not be converted into a CValue.
* added scene.objects to replace scene.getObjectList()
* added function names to PyArg_ParseTuple() so errors will include the function names 
* removed cases of PyArg_ParseTuple(args,"O",&pyobj) where METH_O ensures a single argument.
* Made PyObjectFrom use ugly python api rather then Py_BuildValue(), approx %40 speedup for functions that return Python vector and matrix types like ob.orientation.

1 files changed, 36 insertions, 55 deletions

diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp
index b8a8a1a63b2..9acc6ad2cde 100644
--- a/source/gameengine/Expressions/ListValue.cpp
+++ b/source/gameengine/Expressions/ListValue.cpp
@@ -224,10 +224,10 @@ PyParentObject CListValue::Parents[] = {
 
 
 PyMethodDef CListValue::Methods[] = {
-	{"append", (PyCFunction)CListValue::sPyappend,METH_VARARGS},
-	{"reverse", (PyCFunction)CListValue::sPyreverse,METH_VARARGS},
-	{"index", (PyCFunction)CListValue::sPyindex,METH_VARARGS},
-	{"count", (PyCFunction)CListValue::sPycount,METH_VARARGS},
+	{"append", (PyCFunction)CListValue::sPyappend,METH_O},
+	{"reverse", (PyCFunction)CListValue::sPyreverse,METH_NOARGS},
+	{"index", (PyCFunction)CListValue::sPyindex,METH_O},
+	{"count", (PyCFunction)CListValue::sPycount,METH_O},
 	
 	{NULL,NULL} //Sentinel
 };
@@ -403,34 +403,17 @@ void CListValue::MergeList(CListValue *otherlist)
 
 
 
-PyObject* CListValue::Pyappend(PyObject* self, 
-			       PyObject* args, 
-			       PyObject* kwds)
+PyObject* CListValue::Pyappend(PyObject* self, PyObject* value)
 {
-
-	PyObject* pyobj = NULL;
-	if (PyArg_ParseTuple(args,"O",&pyobj))
-	{
-		return listvalue_buffer_concat(self,pyobj);
-	}
-	else
-	{
-	   return NULL;	     
-	}
-
-	
+	return listvalue_buffer_concat(self, value);
 }
 
 
 
-PyObject* CListValue::Pyreverse(PyObject* self, 
-			       PyObject* args, 
-			       PyObject* kwds)
+PyObject* CListValue::Pyreverse(PyObject* self)
 {
 	std::reverse(m_pValueArray.begin(),m_pValueArray.end());
-
 	Py_RETURN_NONE;
-	
 }
 
 
@@ -452,58 +435,56 @@ bool CListValue::CheckEqual(CValue* first,CValue* second)
 
 
 
-PyObject* CListValue::Pyindex(PyObject* self, 
-			       PyObject* args, 
-			       PyObject* kwds)
+PyObject* CListValue::Pyindex(PyObject* self, PyObject *value)
 {
 	PyObject* result = NULL;
 
-	PyObject* pyobj = NULL;
-	if (PyArg_ParseTuple(args,"O",&pyobj))
+	CValue* checkobj = ConvertPythonToValue(value);
+	if (checkobj==NULL)
+		return NULL; /* ConvertPythonToValue sets the error */
+
+	int numelem = GetCount();
+	for (int i=0;i<numelem;i++)
 	{
-	
-		CValue* checkobj = ConvertPythonToValue(pyobj);
-		int numelem = GetCount();
-		for (int i=0;i<numelem;i++)
+		CValue* elem = 			GetValue(i);
+		if (CheckEqual(checkobj,elem))
 		{
-			CValue* elem = 			GetValue(i);
-			if (CheckEqual(checkobj,elem))
-			{
-				result = PyInt_FromLong(i);
-				break;
-			}
+			result = PyInt_FromLong(i);
+			break;
 		}
-		checkobj->Release();
 	}
+	checkobj->Release();
 
+	if (result==NULL) {
+		PyErr_SetString(PyExc_ValueError, "ValueError: list.index(x): x not in CListValue");
+	}
 	return result;
 	
 }
 
 
 
-PyObject* CListValue::Pycount(PyObject* self, 
-			       PyObject* args, 
-			       PyObject* kwds)
+PyObject* CListValue::Pycount(PyObject* self, PyObject* value)
 {
-	
 	int numfound = 0;
 
-	PyObject* pyobj = NULL;
-	if (PyArg_ParseTuple(args,"O",&pyobj))
+	CValue* checkobj = ConvertPythonToValue(value);
+	
+	if (checkobj==NULL) { /* in this case just return that there are no items in the list */
+		PyErr_Clear();
+		PyInt_FromLong(0);
+	}
+
+	int numelem = GetCount();
+	for (int i=0;i<numelem;i++)
 	{
-		CValue* checkobj = ConvertPythonToValue(pyobj);
-		int numelem = GetCount();
-		for (int i=0;i<numelem;i++)
+		CValue* elem = 			GetValue(i);
+		if (CheckEqual(checkobj,elem))
 		{
-			CValue* elem = 			GetValue(i);
-			if (CheckEqual(checkobj,elem))
-			{
-				numfound ++;
-			}
+			numfound ++;
 		}
-		checkobj->Release();
 	}
+	checkobj->Release();
 
 	return PyInt_FromLong(numfound);
 }