psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-12-02 13:43:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

'poll()' can raise a Python exception in case of error.

Browse Source
This commit is contained in:
Daniele Varrazzo 2010-04-03 22:32:37 +01:00
parent 442b3b2f6c
commit 55270cab9f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
psycopg/connection_int.c
View File

@ -724,7 +724,12 @@ conn_poll_green(connectionObject *self)
res = PSYCO_POLL_ERROR; res = PSYCO_POLL_ERROR;
} }
return PyInt_FromLong(res); if (!(res == PSYCO_POLL_ERROR && PyErr_Occurred())) {
return PyInt_FromLong(res);
} else {
/* There is an error and an exception is already in place */
return NULL;
}
} }
/* conn_close - do anything needed to shut down the connection */ /* conn_close - do anything needed to shut down the connection */