]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-43314: Remove SQLITE_OPEN_URI ifdef (GH-24637)
authorErlend Egeberg Aasland <erlend.aasland@innova.no>
Fri, 26 Feb 2021 00:48:19 +0000 (01:48 +0100)
committerGitHub <noreply@github.com>
Fri, 26 Feb 2021 00:48:19 +0000 (02:48 +0200)
SQLite 3.7.15 is required as by GH-24106. SQLITE_OPEN_URI was added in
SQLite 3.7.7.

Modules/_sqlite/connection.c

index f6a6ef69e179c12a4b3072d063ff5ee92a0e8b55..53d358ea9d2eb99959cdf27da4fc9f97f188a718 100644 (file)
@@ -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);