From 91ea37c84af2dd5ea92802a4c2adad47861ac067 Mon Sep 17 00:00:00 2001 From: Erlend Egeberg Aasland Date: Fri, 26 Feb 2021 00:39:34 +0100 Subject: bpo-43290: Remove workaround from pysqlite_step() (GH-24638) From the SQLite 3.5.3 changelog: sqlite3_step() returns SQLITE_MISUSE instead of crashing when called with a NULL parameter. The workaround no longer needed because we no longer support SQLite releases older than 3.7.15. --- Modules/_sqlite/util.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c index 1dbabcd..0f4eba0 100644 --- a/Modules/_sqlite/util.c +++ b/Modules/_sqlite/util.c @@ -28,15 +28,9 @@ int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection) { int rc; - if (statement == NULL) { - /* this is a workaround for SQLite 3.5 and later. it now apparently - * returns NULL for "no-operation" statements */ - rc = SQLITE_OK; - } else { - Py_BEGIN_ALLOW_THREADS - rc = sqlite3_step(statement); - Py_END_ALLOW_THREADS - } + Py_BEGIN_ALLOW_THREADS + rc = sqlite3_step(statement); + Py_END_ALLOW_THREADS return rc; } -- cgit v0.12