Mercurial > hg > orthanc-python
changeset 75:cbfc72a53970
refactoring calls to PythonLock::RaiseException()
line wrap: on
line diff
--- a/CodeAnalysis/Class.mustache Sat Jun 12 08:00:57 2021 +0200 +++ b/CodeAnalysis/Class.mustache Mon Aug 09 16:59:59 2021 +0200 @@ -113,8 +113,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; }
--- a/CodeAnalysis/FunctionBody.mustache Sat Jun 12 08:00:57 2021 +0200 +++ b/CodeAnalysis/FunctionBody.mustache Mon Aug 09 16:59:59 2021 +0200 @@ -5,7 +5,6 @@ {{#has_args}} if (!PyArg_ParseTuple(args, {{tuple_format}})) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments ({{count_args}} arguments expected)"); return NULL; } @@ -34,9 +33,7 @@ {{#args}}{{release}}{{/args}} if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -62,9 +59,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } {{/return_error}} @@ -74,9 +69,7 @@ {{#args}}{{release}}{{/args}} if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -97,9 +90,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } {{/return_bytes}}
--- a/Sources/Autogenerated/sdk_GlobalFunctions.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_GlobalFunctions.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -27,7 +27,6 @@ if (!PyArg_ParseTuple(args, "iii", &arg0, &arg1, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -54,7 +53,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -73,7 +71,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -92,7 +89,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -111,7 +107,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -124,9 +119,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -139,7 +132,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -152,9 +144,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -167,7 +157,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -180,9 +169,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -196,7 +183,6 @@ if (!PyArg_ParseTuple(args, "ss*", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -209,9 +195,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -225,7 +209,6 @@ if (!PyArg_ParseTuple(args, "ss*", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -238,9 +221,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -253,7 +234,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -267,9 +247,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -282,7 +260,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -296,9 +273,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -312,7 +287,6 @@ if (!PyArg_ParseTuple(args, "ss*", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -325,9 +299,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -341,7 +313,6 @@ if (!PyArg_ParseTuple(args, "ss*", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -354,9 +325,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -369,7 +338,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -378,9 +346,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -397,7 +363,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -406,9 +371,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -425,7 +388,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -434,9 +396,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -453,7 +413,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -462,9 +421,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -481,7 +438,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -490,9 +446,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -511,9 +465,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -532,9 +484,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -553,9 +503,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -572,7 +520,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -591,7 +538,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -610,7 +556,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -630,7 +575,6 @@ if (!PyArg_ParseTuple(args, "ls", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -639,9 +583,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -659,7 +601,6 @@ if (!PyArg_ParseTuple(args, "ls", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -673,9 +614,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -698,7 +637,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -707,9 +645,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -738,9 +674,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -759,7 +693,6 @@ if (!PyArg_ParseTuple(args, "s*lb", &arg0, &arg2, &arg3)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -772,9 +705,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -787,7 +718,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -800,9 +730,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -816,7 +744,6 @@ if (!PyArg_ParseTuple(args, "ss*", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -830,9 +757,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -845,7 +770,6 @@ if (!PyArg_ParseTuple(args, "l", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -871,7 +795,6 @@ if (!PyArg_ParseTuple(args, "s*l", &arg0, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -880,9 +803,7 @@ PyBuffer_Release(&arg0); if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -906,7 +827,6 @@ if (!PyArg_ParseTuple(args, "lkkks*", &arg0, &arg1, &arg2, &arg3, &arg4)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (5 arguments expected)"); return NULL; } @@ -919,9 +839,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -939,7 +857,6 @@ if (!PyArg_ParseTuple(args, "lkkks*b", &arg0, &arg1, &arg2, &arg3, &arg4, &arg5)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (6 arguments expected)"); return NULL; } @@ -952,9 +869,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -969,7 +884,6 @@ if (!PyArg_ParseTuple(args, "sss", &arg0, &arg1, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -982,9 +896,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -1000,7 +912,6 @@ if (!PyArg_ParseTuple(args, "ss*ss", &arg0, &arg1, &arg3, &arg4)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (4 arguments expected)"); return NULL; } @@ -1013,9 +924,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -1031,7 +940,6 @@ if (!PyArg_ParseTuple(args, "ss*ss", &arg0, &arg1, &arg3, &arg4)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (4 arguments expected)"); return NULL; } @@ -1044,9 +952,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -1061,7 +967,6 @@ if (!PyArg_ParseTuple(args, "sss", &arg0, &arg1, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -1075,9 +980,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -1100,7 +1003,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -1125,7 +1027,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -1144,7 +1045,6 @@ if (!PyArg_ParseTuple(args, "lHs", &arg0, &arg1, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -1158,9 +1058,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -1178,7 +1076,6 @@ if (!PyArg_ParseTuple(args, "HHlskk", &arg0, &arg1, &arg2, &arg3, &arg4, &arg5)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (6 arguments expected)"); return NULL; } @@ -1192,9 +1089,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -1213,7 +1108,6 @@ if (!PyArg_ParseTuple(args, "HHlskks", &arg0, &arg1, &arg2, &arg3, &arg4, &arg5, &arg6)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (7 arguments expected)"); return NULL; } @@ -1227,9 +1121,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -1245,7 +1137,6 @@ if (!PyArg_ParseTuple(args, "s*llk", &arg0, &arg2, &arg3, &arg4)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (4 arguments expected)"); return NULL; } @@ -1254,9 +1145,7 @@ PyBuffer_Release(&arg0); if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1276,7 +1165,6 @@ if (!PyArg_ParseTuple(args, "sllk", &arg0, &arg1, &arg2, &arg3)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (4 arguments expected)"); return NULL; } @@ -1285,9 +1173,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1306,7 +1192,6 @@ if (!PyArg_ParseTuple(args, "lkk", &arg0, &arg1, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -1315,9 +1200,7 @@ if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1338,7 +1221,6 @@ if (!PyArg_ParseTuple(args, "s*k", &arg0, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -1347,9 +1229,7 @@ PyBuffer_Release(&arg0); if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1369,7 +1249,6 @@ if (!PyArg_ParseTuple(args, "s*", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -1378,9 +1257,7 @@ PyBuffer_Release(&arg0); if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1397,7 +1274,6 @@ if (!PyArg_ParseTuple(args, "s*", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -1406,9 +1282,7 @@ PyBuffer_Release(&arg0); if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1427,9 +1301,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1446,7 +1318,6 @@ if (!PyArg_ParseTuple(args, "s*", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -1455,9 +1326,7 @@ PyBuffer_Release(&arg0); if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1479,9 +1348,7 @@ if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1501,7 +1368,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -1528,7 +1394,6 @@ if (!PyArg_ParseTuple(args, "sfl", &arg0, &arg1, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -1549,7 +1414,6 @@ if (!PyArg_ParseTuple(args, "HHs", &arg0, &arg1, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -1558,9 +1422,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1577,7 +1439,6 @@ if (!PyArg_ParseTuple(args, "s*", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -1586,9 +1447,7 @@ PyBuffer_Release(&arg0); if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1609,7 +1468,6 @@ if (!PyArg_ParseTuple(args, "s*s", &arg0, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -1618,9 +1476,7 @@ PyBuffer_Release(&arg0); if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -1640,7 +1496,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -1653,9 +1508,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -1670,9 +1523,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else
--- a/Sources/Autogenerated/sdk_OrthancPluginDicomInstance.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginDicomInstance.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -167,8 +167,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -194,8 +192,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -213,8 +209,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -225,9 +219,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -243,8 +235,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -255,9 +245,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -273,8 +261,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -283,7 +269,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -299,8 +284,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -309,7 +292,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -333,8 +315,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -352,8 +332,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -364,9 +342,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -382,8 +358,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -401,8 +375,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -420,8 +392,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -430,7 +400,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -443,9 +412,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -457,8 +424,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -467,7 +432,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -476,9 +440,7 @@ if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -497,8 +459,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -513,9 +473,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -527,8 +485,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -539,7 +495,6 @@ if (!PyArg_ParseTuple(args, "llk", &arg0, &arg1, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -548,9 +503,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else
--- a/Sources/Autogenerated/sdk_OrthancPluginFindAnswers.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginFindAnswers.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -87,8 +87,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -97,7 +95,6 @@ if (!PyArg_ParseTuple(args, "s*", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -111,9 +108,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -125,8 +120,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -142,9 +135,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } }
--- a/Sources/Autogenerated/sdk_OrthancPluginFindMatcher.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginFindMatcher.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -97,8 +97,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -107,7 +105,6 @@ if (!PyArg_ParseTuple(args, "s*", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; }
--- a/Sources/Autogenerated/sdk_OrthancPluginFindQuery.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginFindQuery.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -102,8 +102,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -121,8 +119,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -131,7 +127,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -140,9 +135,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -158,8 +151,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -168,7 +159,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -177,9 +167,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else
--- a/Sources/Autogenerated/sdk_OrthancPluginImage.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginImage.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -127,8 +127,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -146,8 +144,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -165,8 +161,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -184,8 +178,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -203,8 +195,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -213,7 +203,6 @@ if (!PyArg_ParseTuple(args, "l", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -222,9 +211,7 @@ if (obj == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else @@ -243,8 +230,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -259,7 +244,6 @@ if (!PyArg_ParseTuple(args, "ksllbbb", &arg0, &arg1, &arg2, &arg3, &arg4, &arg5, &arg6)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (7 arguments expected)"); return NULL; } @@ -273,9 +257,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } }
--- a/Sources/Autogenerated/sdk_OrthancPluginJob.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginJob.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -97,8 +97,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -107,7 +105,6 @@ if (!PyArg_ParseTuple(args, "i", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -116,9 +113,7 @@ if (s.GetContent() == NULL) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } else
--- a/Sources/Autogenerated/sdk_OrthancPluginPeers.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginPeers.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -112,8 +112,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -131,8 +129,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -141,7 +137,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -165,8 +160,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -175,7 +168,6 @@ if (!PyArg_ParseTuple(args, "k", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -199,8 +191,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -210,7 +200,6 @@ if (!PyArg_ParseTuple(args, "ks", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; }
--- a/Sources/Autogenerated/sdk_OrthancPluginRestOutput.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginRestOutput.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -142,8 +142,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -153,7 +151,6 @@ if (!PyArg_ParseTuple(args, "s*s", &arg0, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -171,8 +168,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -185,7 +180,6 @@ if (!PyArg_ParseTuple(args, "lkkks*", &arg0, &arg1, &arg2, &arg3, &arg4)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (5 arguments expected)"); return NULL; } @@ -203,8 +197,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -213,7 +205,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -231,8 +222,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -241,7 +230,6 @@ if (!PyArg_ParseTuple(args, "H", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -259,8 +247,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -269,7 +255,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -287,8 +272,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -297,7 +280,6 @@ if (!PyArg_ParseTuple(args, "s", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -315,8 +297,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -326,7 +306,6 @@ if (!PyArg_ParseTuple(args, "ss", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -344,8 +323,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -355,7 +332,6 @@ if (!PyArg_ParseTuple(args, "ss", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -373,8 +349,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -384,7 +358,6 @@ if (!PyArg_ParseTuple(args, "ss", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -398,9 +371,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -412,8 +383,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -422,7 +391,6 @@ if (!PyArg_ParseTuple(args, "s*", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -436,9 +404,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -450,8 +416,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -462,7 +426,6 @@ if (!PyArg_ParseTuple(args, "Hsk", &arg0, &arg1, &arg2)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (3 arguments expected)"); return NULL; } @@ -480,8 +443,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -495,7 +456,6 @@ if (!PyArg_ParseTuple(args, "lkkks*b", &arg0, &arg1, &arg2, &arg3, &arg4, &arg5)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (6 arguments expected)"); return NULL; } @@ -513,8 +473,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -524,7 +482,6 @@ if (!PyArg_ParseTuple(args, "sb", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; }
--- a/Sources/Autogenerated/sdk_OrthancPluginStorageArea.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginStorageArea.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -97,8 +97,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -110,7 +108,6 @@ if (!PyArg_ParseTuple(args, "ss*Kl", &arg0, &arg1, &arg2, &arg3)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (4 arguments expected)"); return NULL; } @@ -124,9 +121,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -138,8 +133,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -149,7 +142,6 @@ if (!PyArg_ParseTuple(args, "sl", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -162,9 +154,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } } @@ -176,8 +166,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -187,7 +175,6 @@ if (!PyArg_ParseTuple(args, "sl", &arg0, &arg1)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (2 arguments expected)"); return NULL; } @@ -201,9 +188,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } } @@ -215,8 +200,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -225,7 +208,6 @@ if (!PyArg_ParseTuple(args, "l", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -239,9 +221,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } }
--- a/Sources/Autogenerated/sdk_OrthancPluginWorklistAnswers.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginWorklistAnswers.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -87,8 +87,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -104,9 +102,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, code); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(code); return NULL; } }
--- a/Sources/Autogenerated/sdk_OrthancPluginWorklistQuery.impl.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/Autogenerated/sdk_OrthancPluginWorklistQuery.impl.h Mon Aug 09 16:59:59 2021 +0200 @@ -87,8 +87,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -97,7 +95,6 @@ if (!PyArg_ParseTuple(args, "s*", &arg0)) { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 PyErr_SetString(PyExc_TypeError, "Bad types for the arguments (1 arguments expected)"); return NULL; } @@ -113,8 +110,6 @@ if (self->object_ == NULL) { - // TODO: RAISE - //PythonLock::RaiseException(module, OrthancPluginErrorCode_NullPointer); PyErr_SetString(PyExc_ValueError, "Invalid object"); return NULL; } @@ -129,9 +124,7 @@ } else { - // TODO => RAISE : https://stackoverflow.com/questions/60832317 - //PythonLock::RaiseException(module, OrthancPluginErrorCode_InternalError); - PyErr_SetString(PyExc_ValueError, "Internal error"); + PythonLock::RaiseException(OrthancPluginErrorCode_InternalError); return NULL; } }
--- a/Sources/PythonLock.cpp Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/PythonLock.cpp Mon Aug 09 16:59:59 2021 +0200 @@ -472,11 +472,13 @@ } -void PythonLock::RaiseException(PyObject* module, - OrthancPluginErrorCode code) +void PythonLock::RaiseException(OrthancPluginErrorCode code) { if (code != OrthancPluginErrorCode_Success) { + PyErr_SetString(PyExc_ValueError, "Internal error"); + +#if 0 const char* message = OrthancPluginGetErrorDescription(OrthancPlugins::GetGlobalContext(), code); struct module_state *state = GETSTATE(module); @@ -488,6 +490,7 @@ { PyErr_SetString(state->exceptionClass_, message); } +#endif } }
--- a/Sources/PythonLock.h Sat Jun 12 08:00:57 2021 +0200 +++ b/Sources/PythonLock.h Mon Aug 09 16:59:59 2021 +0200 @@ -59,8 +59,7 @@ static void AddSysPath(const std::string& path); - static void RaiseException(PyObject* module, - OrthancPluginErrorCode code); + static void RaiseException(OrthancPluginErrorCode code); static void LogCall(const std::string& message); };