Skip to content
Snippets Groups Projects
Commit a3ee5ad6 authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux florent@laas.fr
Browse files

Raise exception when PyCObject_Check fails.

parent e04b3a80
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 6 deletions
src/entity-py.cc
+ 16
− 6
View file @ a3ee5ad6
...@@ -81,8 +81,11 @@ namespace dynamicgraph { ...@@ -81,8 +81,11 @@ namespace dynamicgraph {
if (!PyArg_ParseTuple(args, "O", &object)) if (!PyArg_ParseTuple(args, "O", &object))
return NULL; return NULL;
if (!PyCObject_Check(object)) if (!PyCObject_Check(object)) {
PyErr_SetString(PyExc_TypeError,
"function takes a PyCObject as argument");
return NULL; return NULL;
}
pointer = PyCObject_AsVoidPtr(object); pointer = PyCObject_AsVoidPtr(object);
Entity* entity = (Entity*)pointer; Entity* entity = (Entity*)pointer;
...@@ -108,8 +111,11 @@ namespace dynamicgraph { ...@@ -108,8 +111,11 @@ namespace dynamicgraph {
if (!PyArg_ParseTuple(args, "Os", &object, &name)) if (!PyArg_ParseTuple(args, "Os", &object, &name))
return NULL; return NULL;
if (!PyCObject_Check(object)) if (!PyCObject_Check(object)) {
PyErr_SetString(PyExc_TypeError,
"function takes a PyCObject as argument");
return NULL; return NULL;
}
pointer = PyCObject_AsVoidPtr(object); pointer = PyCObject_AsVoidPtr(object);
Entity* entity = (Entity*)pointer; Entity* entity = (Entity*)pointer;
...@@ -134,8 +140,11 @@ namespace dynamicgraph { ...@@ -134,8 +140,11 @@ namespace dynamicgraph {
if (!PyArg_ParseTuple(args, "O", &object)) if (!PyArg_ParseTuple(args, "O", &object))
return NULL; return NULL;
if (!PyCObject_Check(object)) if (!PyCObject_Check(object)) {
PyErr_SetString(PyExc_TypeError,
"function takes a PyCObject as argument");
return NULL; return NULL;
}
pointer = PyCObject_AsVoidPtr(object); pointer = PyCObject_AsVoidPtr(object);
Entity* entity = (Entity*)pointer; Entity* entity = (Entity*)pointer;
...@@ -368,7 +377,7 @@ namespace dynamicgraph { ...@@ -368,7 +377,7 @@ namespace dynamicgraph {
// Retrieve the entity instance // Retrieve the entity instance
if (!PyCObject_Check(object)) { if (!PyCObject_Check(object)) {
PyErr_SetString(error, "first argument is not an object"); PyErr_SetString(PyExc_TypeError, "first argument is not an object");
return NULL; return NULL;
} }
pointer = PyCObject_AsVoidPtr(object); pointer = PyCObject_AsVoidPtr(object);
...@@ -376,7 +385,7 @@ namespace dynamicgraph { ...@@ -376,7 +385,7 @@ namespace dynamicgraph {
// Retrieve the argument tuple // Retrieve the argument tuple
if (!PyTuple_Check(argTuple)) { if (!PyTuple_Check(argTuple)) {
PyErr_SetString(error, "third argument is not a tuple"); PyErr_SetString(PyExc_TypeError, "third argument is not a tuple");
return NULL; return NULL;
} }
unsigned int size = PyTuple_Size(argTuple); unsigned int size = PyTuple_Size(argTuple);
...@@ -436,7 +445,8 @@ namespace dynamicgraph { ...@@ -436,7 +445,8 @@ namespace dynamicgraph {
// Retrieve the entity instance // Retrieve the entity instance
if (!PyCObject_Check(object)) { if (!PyCObject_Check(object)) {
PyErr_SetString(error, "first argument is not an object"); PyErr_SetString(PyExc_TypeError,
"function takes a PyCObject as argument");
return NULL; return NULL;
} }
void* pointer = PyCObject_AsVoidPtr(object); void* pointer = PyCObject_AsVoidPtr(object);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment