diff --git a/PythonClientAPI.cpp b/PythonClientAPI.cpp index 1e4e517..f6d1482 100644 --- a/PythonClientAPI.cpp +++ b/PythonClientAPI.cpp @@ -826,11 +826,8 @@ PyObject * PythonClientAPI::Run( const char *cmd, int argc, char * const *argv ) } // Check for pending exception from callbacks - PyObject *excType, *excValue, *excTb; - if( ui.GetPendingException(&excType, &excValue, &excTb) ) { - PyErr_Restore(excType, excValue, excTb); - return NULL; - } + if (ui.RaisePendingException()) + return NULL; p4py::P4Result &results = ui.GetResults(); diff --git a/PythonClientProgress.cpp b/PythonClientProgress.cpp index 5b32a35..bf3cfeb 100644 --- a/PythonClientProgress.cpp +++ b/PythonClientProgress.cpp @@ -70,9 +70,7 @@ PythonClientProgress::PythonClientProgress(PythonClientUser *clientUser, PyObjec Py_DECREF( res ); } else { - PyObject *excType, *excValue, *excTb; - PyErr_Fetch(&excType, &excValue, &excTb); - ui->SetPendingException(excType, excValue, excTb); + ui->SetPendingCurrentException(); } } @@ -88,12 +86,10 @@ void PythonClientProgress::Description( const StrPtr *desc, int units ) PyObject * res = PyObject_CallMethod( this->progress , (char*) "setDescription", (char*)"si", desc->Text(), units ); if( res ) { - Py_DECREF( res ); + Py_DECREF( res ); } else { - PyObject *excType, *excValue, *excTb; - PyErr_Fetch(&excType, &excValue, &excTb); - ui->SetPendingException(excType, excValue, excTb); + ui->SetPendingCurrentException(); } } @@ -103,12 +99,10 @@ void PythonClientProgress::Total( long total ) PyObject * res = PyObject_CallMethod( this->progress , (char*) "setTotal", (char*)"i", total ); if( res ) { - Py_DECREF( res ); + Py_DECREF( res ); } else { - PyObject *excType, *excValue, *excTb; - PyErr_Fetch(&excType, &excValue, &excTb); - ui->SetPendingException(excType, excValue, excTb); + ui->SetPendingCurrentException(); } } @@ -119,13 +113,11 @@ int PythonClientProgress::Update( long pos ) PyObject * result = PyObject_CallMethod( this->progress , (char*) "update", (char*)"l", pos ); if( result == NULL ) { // exception thrown - PyObject *excType, *excValue, *excTb; - PyErr_Fetch(&excType, &excValue, &excTb); - ui->SetPendingException(excType, excValue, excTb); - return 1; + ui->SetPendingCurrentException(); + return 1; } else { - Py_DECREF( result ); + Py_DECREF( result ); } return 0; @@ -140,9 +132,7 @@ void PythonClientProgress::Done( int fail ) Py_DECREF( res ); } else { - PyObject *excType, *excValue, *excTb; - PyErr_Fetch(&excType, &excValue, &excTb); - ui->SetPendingException(excType, excValue, excTb); + ui->SetPendingCurrentException(); } } diff --git a/PythonClientUser.cpp b/PythonClientUser.cpp index 9facd95..9641e03 100644 --- a/PythonClientUser.cpp +++ b/PythonClientUser.cpp @@ -125,6 +125,9 @@ void PythonClientUser::SetPendingException(PyObject *type, PyObject *value, PyOb bool PythonClientUser::GetPendingException(PyObject **type, PyObject **value, PyObject **tb) { if (pendingExcType == NULL) { + *type = NULL; + *value = NULL; + *tb = NULL; return false; } @@ -140,6 +143,29 @@ bool PythonClientUser::GetPendingException(PyObject **type, PyObject **value, Py return true; } +bool PythonClientUser::SetPendingCurrentException() +{ + if (PyErr_Occurred()) + { + PyObject *excType, *excValue, *excTb; + PyErr_Fetch(&excType, &excValue, &excTb); + SetPendingException(excType, excValue, excTb); + return true; + } + return false; +} + +bool PythonClientUser::RaisePendingException() +{ + PyObject *excType, *excValue, *excTb; + if (GetPendingException(&excType, &excValue, &excTb)) + { + PyErr_Restore(excType, excValue, excTb); + return true; + } + return false; +} + void PythonClientUser::ClearPendingException() { Py_XDECREF(pendingExcType); @@ -177,10 +203,8 @@ bool PythonClientUser::CallOutputMethod( const char * method, PyObject * data) PyObject * result = PyObject_CallMethod( this->handler , (char*) method, (char*)"O", data ); if( result == NULL ) { // exception thrown - PyObject *excType, *excValue, *excTb; - PyErr_Fetch(&excType, &excValue, &excTb); - SetPendingException(excType, excValue, excTb); - alive = 0; + SetPendingCurrentException(); + alive = 0; } else { long a = PyInt_AsLong( result ); @@ -544,39 +568,84 @@ void PythonClientUser::InputData( StrBuf *strbuf, Error *e ) debug->debug ( P4PYDBG_CALLS, "[P4] InputData(). Using supplied input" ); - PyObject * inval = input; - - if( PyTuple_Check(input) ) + // first, convert an input tuple to a list + if ( PyTuple_Check(input) ) { - inval = PyTuple_GetItem(input, 0); - input = PyTuple_GetSlice(input, 1, PyTuple_Size(input)); + PyObject *tmp = PySequence_List(input); + if (!tmp) { + SetPendingCurrentException(); + return; + } + Py_DECREF(input); + input = tmp; } - else if ( PyList_Check(input) ) + + PyObject * inval = input; + PyObject * tail = input; + Py_INCREF(inval); + + if ( PyList_Check(input) ) { - inval = PyList_GetItem(input, 0); - input = PyList_GetSlice(input, 1, PyList_Size(input)); + if ( PyList_Size(input) > 0 ) + { + // grab the first element of the list as the input value, keep the rest + PyObject *tmp = inval; + inval = PyList_GetItem(input, 0); + Py_INCREF(inval); + Py_DECREF(tmp); + tail = PyList_GetSlice(input, 1, PyList_Size(input)); + if (tail) + { + PyObject *tmp = input; + input = tail; + Py_DECREF(tmp); + } + else + { + // slice failed, nothing we can do about it + Py_CLEAR(inval); + SetPendingCurrentException(); + return; + } + } + else + { + Py_CLEAR(inval); + } } - + if( inval == Py_None || inval == NULL ) { - PyErr_WarnEx( PyExc_UserWarning, - "[P4] Expected user input, found none. " - "Missing call to P4.input ?", 1 ); - return; + Py_XDECREF(inval); + if (PyErr_WarnEx( PyExc_UserWarning, + "[P4] Expected user input, found none. " + "Missing call to P4.input ?", 1 )) + SetPendingCurrentException(); + return; } if ( PyDict_Check( inval ) ) { - StrPtr * specDef = varList->GetVar( "specdef" ); + StrPtr * specDef = varList->GetVar( "specdef" ); - specMgr->AddSpecDef( cmd.Text(), specDef->Text() ); - specMgr->SpecToString( cmd.Text(), inval, *strbuf, e ); - return; + specMgr->AddSpecDef( cmd.Text(), specDef->Text() ); + specMgr->SpecToString( cmd.Text(), inval, *strbuf, e ); + Py_DECREF(inval); + return; } // Convert whatever's left into a string PyObject * str = PyObject_Str(inval); - strbuf->Set( GetPythonString(str) ); + const char * s = str ? GetPythonString(str) : NULL; + Py_DECREF(inval); + if (!str || !s) + { + SetPendingCurrentException(); + Py_XDECREF(str); + return; + } + + strbuf->Set( s ); Py_XDECREF(str); } @@ -641,11 +710,9 @@ int PythonClientUser::Resolve( ClientMerge *m, Error *e ) PyObject * result = PyObject_CallMethod( this->resolver , (char*)"resolve", (char*)"(O)", mergeData ); if( result == NULL ) { // exception thrown, bug out of here - PyObject *excType, *excValue, *excTb; - PyErr_Fetch(&excType, &excValue, &excTb); - SetPendingException(excType, excValue, excTb); - Py_DECREF(mergeData); - return CMS_QUIT; + SetPendingCurrentException(); + Py_DECREF(mergeData); + return CMS_QUIT; } if (IsString(result)) { @@ -724,11 +791,9 @@ int PythonClientUser::Resolve( ClientResolveA *m, int preview, Error *e ) PyObject * result = PyObject_CallMethod( this->resolver , (char*)"actionResolve", (char*)"(O)", mergeData ); if( result == NULL ) { // exception thrown, bug out of here - PyObject *excType, *excValue, *excTb; - PyErr_Fetch(&excType, &excValue, &excTb); - SetPendingException(excType, excValue, excTb); - Py_DECREF(mergeData); - return CMS_QUIT; + SetPendingCurrentException(); + Py_DECREF(mergeData); + return CMS_QUIT; } StrBuf reply = GetPythonString( result ); diff --git a/PythonClientUser.h b/PythonClientUser.h index aae8a5e..9c8a0a9 100644 --- a/PythonClientUser.h +++ b/PythonClientUser.h @@ -118,6 +118,8 @@ class PythonClientUser: public ClientUser, public KeepAlive void SetPendingException(PyObject *type, PyObject *value, PyObject *tb); bool GetPendingException(PyObject **type, PyObject **value, PyObject **tb); void ClearPendingException(); + bool SetPendingCurrentException(); // returns true if an exception was set + bool RaisePendingException(); // returns true if an exception was raised // override from KeepAlive virtual int IsAlive()