Aug 15, 2023 · Aug 14, 2023 · Aug 14, 2023 · Aug 14, 2023 · Aug 14, 2023 · Aug 15, 2023
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
   .. versionadded:: 3.12
      The *autocommit* parameter.

   .. versionchanged:: 3.13
      Positional use of the parameters *timeout*, *detect_types*,
      *isolation_level*, *check_same_thread*, *factory*, *cached_statements*,
      and *uri* is deprecated.
      They will become keyword-only parameters in Python 3.15.

 .. function:: complete_statement(statement)

   Return ``True`` if the string *statement* appears to contain
diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
  They will be removed in Python 3.15.
  (Contributed by Victor Stinner in :gh:`105096`.)

 * Passing more than one positional argument to :func:`sqlite3.connect` is
  deprecated. The remaining parameters will become keyword-only in Python 3.15.

 Pending Removal in Python 3.14
 ------------------------------

diff --git a/Lib/test/test_sqlite3/test_factory.py b/Lib/test/test_sqlite3/test_factory.py
            def __init__(self, *args, **kwargs):
                super(Factory, self).__init__(*args, **kwargs)

        con = sqlite.connect(":memory:", 5.0, 0, None, True, Factory)
        regex = (
            r"Passing more than 1 positional argument to _sqlite3.Connection\(\) "
            r"is deprecated. Parameters 'timeout', 'detect_types', "
            r"'isolation_level', 'check_same_thread', 'factory', "
            r"'cached_statements' and 'uri' will become keyword-only "
            r"parameters in Python 3.15."
        )
        with self.assertWarnsRegex(DeprecationWarning, regex):
            con = sqlite.connect(":memory:", 5.0, 0, None, True, Factory)
        self.assertIsNone(con.isolation_level)
        self.assertIsInstance(con, Factory)

diff --git a/Misc/NEWS.d/next/Library/2023-08-14-19-49-02.gh-issue-93057.5nJwO5.rst b/Misc/NEWS.d/next/Library/2023-08-14-19-49-02.gh-issue-93057.5nJwO5.rst
 Passing more than one positional argument to :func:`sqlite3.connect` is
 deprecated. The remaining parameters will become keyword-only in Python 3.15.
 Patch by Erlend E. Aasland.
diff --git a/Modules/_sqlite/clinic/_sqlite3.connect.c.h b/Modules/_sqlite/clinic/_sqlite3.connect.c.h
diff --git a/Modules/_sqlite/clinic/connection.c.h b/Modules/_sqlite/clinic/connection.c.h
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
 _sqlite3.Connection.__init__ as pysqlite_connection_init

    database: object
    * [from 3.15]
    timeout: double = 5.0
    detect_types: int = 0
    isolation_level: IsolationLevel = ""
                              int check_same_thread, PyObject *factory,
                              int cache_size, int uri,
                              enum autocommit_mode autocommit)
 /*[clinic end generated code: output=cba057313ea7712f input=9b0ab6c12f674fa3]*/
 /*[clinic end generated code: output=cba057313ea7712f input=219c3dbecbae7d99]*/
 {
    if (PySys_Audit("sqlite3.connect", "O", database) < 0) {
        return -1;
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c

    static const int FACTORY_POS = 5;
    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
    if (nargs > 1 && nargs <= 8) {
        if (PyErr_WarnEx(PyExc_DeprecationWarning,
                "Passing more than 1 positional argument to sqlite3.connect()"
                " is deprecated. Parameters 'timeout', 'detect_types', "
                "'isolation_level', 'check_same_thread', 'factory', "
                "'cached_statements' and 'uri' will become keyword-only "
                "parameters in Python 3.15.", 1))
        {
                return NULL;
        }
    }
    if (nargs > FACTORY_POS) {
        factory = args[FACTORY_POS];
    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -355,6 +355,12 @@ Module functions
		.. versionadded:: 3.12
		The autocommit parameter.

		.. versionchanged:: 3.13
		Positional use of the parameters timeout, detect_types,
		isolation_level, check_same_thread, factory, cached_statements,
		and uri is deprecated.
		They will become keyword-only parameters in Python 3.15.

		.. function:: complete_statement(statement)

		Return ``True`` if the string statement appears to contain
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -219,6 +219,9 @@ Deprecated
		They will be removed in Python 3.15.
		(Contributed by Victor Stinner in :gh:`105096`.)

		* Passing more than one positional argument to :func:`sqlite3.connect` is
erlend-aasland marked this conversation as resolved. OutdatedShow resolvedHide resolved
		deprecated. The remaining parameters will become keyword-only in Python 3.15.

		Pending Removal in Python 3.14
		------------------------------

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -66,7 +66,15 @@ class Factory(sqlite.Connection):
		def __init__(self, args, *kwargs):
		super(Factory, self).__init__(args, *kwargs)

		con = sqlite.connect(":memory:", 5.0, 0, None, True, Factory)
		regex = (
		r"Passing more than 1 positional argument to _sqlite3.Connection\(\) "
erlend-aasland marked this conversation as resolved. Show resolvedHide resolved
		r"is deprecated. Parameters 'timeout', 'detect_types', "
		r"'isolation_level', 'check_same_thread', 'factory', "
		r"'cached_statements' and 'uri' will become keyword-only "
		r"parameters in Python 3.15."
		)
		with self.assertWarnsRegex(DeprecationWarning, regex):
		con = sqlite.connect(":memory:", 5.0, 0, None, True, Factory)
erlend-aasland marked this conversation as resolved. OutdatedShow resolvedHide resolved
		self.assertIsNone(con.isolation_level)
		self.assertIsInstance(con, Factory)

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Passing more than one positional argument to :func:`sqlite3.connect` is
		deprecated. The remaining parameters will become keyword-only in Python 3.15.
		Patch by Erlend E. Aasland.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -216,6 +216,7 @@ class sqlite3_int64_converter(CConverter):
		_sqlite3.Connection.__init__ as pysqlite_connection_init

		database: object
		* [from 3.15]
		timeout: double = 5.0
		detect_types: int = 0
		isolation_level: IsolationLevel = ""
Expand All		@@ -234,7 +235,7 @@ pysqlite_connection_init_impl(pysqlite_Connection self, PyObject database,
		int check_same_thread, PyObject *factory,
		int cache_size, int uri,
		enum autocommit_mode autocommit)
		/[clinic end generated code: output=cba057313ea7712f input=9b0ab6c12f674fa3]/
		/[clinic end generated code: output=cba057313ea7712f input=219c3dbecbae7d99]/
		{
		if (PySys_Audit("sqlite3.connect", "O", database) < 0) {
		return -1;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,6 +64,17 @@ pysqlite_connect(PyObject module, PyObject const *args, Py_ssize_t nargsf,

		static const int FACTORY_POS = 5;
		Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
		if (nargs > 1 && nargs <= 8) {
		if (PyErr_WarnEx(PyExc_DeprecationWarning,
		"Passing more than 1 positional argument to sqlite3.connect()"
		" is deprecated. Parameters 'timeout', 'detect_types', "
		"'isolation_level', 'check_same_thread', 'factory', "
		"'cached_statements' and 'uri' will become keyword-only "
		"parameters in Python 3.15.", 1))
		{
		return NULL;
		}
		}
		if (nargs > FACTORY_POS) {
		factory = args[FACTORY_POS];
		}
Expand Down