(original) (raw)

changeset: 84705:9bae7696951f user: Victor Stinner victor.stinner@gmail.com date: Thu Jul 18 01:54:37 2013 +0200 files: Modules/_sqlite/cursor.c description: Issue #18408: Fix _pysqlite_fetch_one_row(), in debug mode, don't call type_call() with an exception set diff -r 48a869a39e2d -r 9bae7696951f Modules/_sqlite/cursor.c --- a/Modules/_sqlite/cursor.c Thu Jul 18 01:41:08 2013 +0200 +++ b/Modules/_sqlite/cursor.c Thu Jul 18 01:54:37 2013 +0200 @@ -339,6 +339,11 @@ if (self->connection->text_factory == (PyObject*)&PyUnicode_Type) { converted = PyUnicode_FromStringAndSize(val_str, nbytes); if (!converted) { +#ifdef Py_DEBUG + /* in debug mode, type_call() fails with an assertion + error if an exception is set when it is called */ + PyErr_Clear(); +#endif colname = sqlite3_column_name(self->statement->st, i); if (!colname) { colname = "";/victor.stinner@gmail.com