https://github.com/python/cpython/commit/8eb106240f5d70baeabd4ad137de6213dd8cfb30
commit: 8eb106240f5d70baeabd4ad137de6213dd8cfb30
branch: main
author: chiri <[email protected]>
committer: erlend-aasland <[email protected]>
date: 2025-09-17T15:51:14Z
summary:
gh-138736: Fix sqlite3.Connection.blobopen 'row' parameter type and naming
(#138738)
The 'row' parameter represents a ROWID. Clarify this in docs and docstrings.
files:
M Doc/library/sqlite3.rst
M Modules/_sqlite/clinic/connection.c.h
M Modules/_sqlite/connection.c
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index d317ead66f9bcb..6a7e15db223210 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -620,7 +620,7 @@ Connection objects
supplied, this must be a :term:`callable` returning
an instance of :class:`Cursor` or its subclasses.
- .. method:: blobopen(table, column, row, /, *, readonly=False, name="main")
+ .. method:: blobopen(table, column, rowid, /, *, readonly=False,
name="main")
Open a :class:`Blob` handle to an existing
:abbr:`BLOB (Binary Large OBject)`.
@@ -631,8 +631,8 @@ Connection objects
:param str column:
The name of the column where the blob is located.
- :param str row:
- The name of the row where the blob is located.
+ :param int rowid:
+ The row id where the blob is located.
:param bool readonly:
Set to ``True`` if the blob should be opened without write
diff --git a/Modules/_sqlite/clinic/connection.c.h
b/Modules/_sqlite/clinic/connection.c.h
index f0e9fdb889413f..abb864eb030757 100644
--- a/Modules/_sqlite/clinic/connection.c.h
+++ b/Modules/_sqlite/clinic/connection.c.h
@@ -209,7 +209,7 @@ pysqlite_connection_cursor(PyObject *self, PyObject *const
*args, Py_ssize_t nar
}
PyDoc_STRVAR(blobopen__doc__,
-"blobopen($self, table, column, row, /, *, readonly=False, name=\'main\')\n"
+"blobopen($self, table, column, rowid, /, *, readonly=False, name=\'main\')\n"
"--\n"
"\n"
"Open and return a BLOB object.\n"
@@ -218,8 +218,8 @@ PyDoc_STRVAR(blobopen__doc__,
" Table name.\n"
" column\n"
" Column name.\n"
-" row\n"
-" Row index.\n"
+" rowid\n"
+" Row id.\n"
" readonly\n"
" Open the BLOB without write permissions.\n"
" name\n"
@@ -1722,4 +1722,4 @@ getconfig(PyObject *self, PyObject *arg)
#ifndef DESERIALIZE_METHODDEF
#define DESERIALIZE_METHODDEF
#endif /* !defined(DESERIALIZE_METHODDEF) */
-/*[clinic end generated code: output=6cb96e557133d553 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=16d44c1d8a45e622 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 208e3c18425986..9e6209315dd9c7 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -578,8 +578,8 @@ _sqlite3.Connection.blobopen as blobopen
Table name.
column as col: str
Column name.
- row: sqlite3_int64
- Row index.
+ rowid as row: sqlite3_int64
+ Row id.
/
*
readonly: bool = False
@@ -593,7 +593,7 @@ Open and return a BLOB object.
static PyObject *
blobopen_impl(pysqlite_Connection *self, const char *table, const char *col,
sqlite3_int64 row, int readonly, const char *name)
-/*[clinic end generated code: output=6a02d43efb885d1c input=23576bd1108d8774]*/
+/*[clinic end generated code: output=6a02d43efb885d1c input=cc3d4b47dac08401]*/
{
if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
return NULL;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]