Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions PythonClientAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
28 changes: 9 additions & 19 deletions PythonClientProgress.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand All @@ -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();
}
}

Expand All @@ -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();
}

}
Expand All @@ -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;
Expand All @@ -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();
}
}

57 changes: 39 additions & 18 deletions PythonClientUser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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);
Expand Down Expand Up @@ -174,19 +200,18 @@ static const int CANCEL = 2;
bool PythonClientUser::CallOutputMethod( const char * method, PyObject * data)
{
long answer = REPORT;

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 {
else
{
long a = PyInt_AsLong( result );
Py_DECREF( result );
if( a == -1 ) {
alive = 0; // exception thrown or silly return value
if( a == -1 && PyErr_Occurred()) {
SetPendingCurrentException();
alive = 0;
}
else
{
Expand Down Expand Up @@ -641,11 +666,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)) {
Expand Down Expand Up @@ -724,11 +747,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 );
Expand Down
2 changes: 2 additions & 0 deletions PythonClientUser.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
15 changes: 15 additions & 0 deletions p4test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2094,6 +2094,21 @@ def outputStat(self, stat):
self.assertEqual(str(cm.exception), 'boom from outputStat')
self.p4.handler = None

class InvalidReturnOutputHandler(P4.OutputHandler):
def __init__(self):
self.called = False

def outputStat(self, stat):
self.called = True
return "not an integer"

handler = InvalidReturnOutputHandler()
self.p4.handler = handler
with self.assertRaises(TypeError):
self.p4.run('info')
self.assertTrue(handler.called, "outputStat handler was not invoked")
self.p4.handler = None

# Verify connection is still usable
result = self.p4.run('info')
self.assertTrue(len(result) > 0, "Connection should remain usable after callback exception")
Expand Down