From 14e9ce9f3260da10de6e84e571be385620fd25fc Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Wed, 24 Feb 2021 11:51:06 +0100 Subject: [PATCH] bpo-43314: Remove SQLITE_OPEN_URI ifdef SQLite 3.7.15 is required as by GH-24106. SQLITE_OPEN_URI was added in SQLite 3.7.7. --- Modules/_sqlite/connection.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index f6a6ef69e179c1..53d358ea9d2eb9 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -102,21 +102,10 @@ pysqlite_connection_init(pysqlite_Connection *self, PyObject *args, Py_INCREF(&PyUnicode_Type); Py_XSETREF(self->text_factory, (PyObject*)&PyUnicode_Type); -#ifdef SQLITE_OPEN_URI Py_BEGIN_ALLOW_THREADS rc = sqlite3_open_v2(database, &self->db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | (uri ? SQLITE_OPEN_URI : 0), NULL); -#else - if (uri) { - PyErr_SetString(pysqlite_NotSupportedError, "URIs not supported"); - return -1; - } - Py_BEGIN_ALLOW_THREADS - /* No need to use sqlite3_open_v2 as sqlite3_open(filename, db) is the - same as sqlite3_open_v2(filename, db, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE, NULL). */ - rc = sqlite3_open(database, &self->db); -#endif Py_END_ALLOW_THREADS Py_DECREF(database_obj);