[3.9] bpo-46878: Purge 'non-standard' from sqlite3 docstrings (GH-31612) (GH-31754)

(cherry picked from commit 4d95fa1ac5d31ff450fb2f31b55ce1eb99d6efcb)

diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 90327376cc0d47e964a28f71c3466c37b40e5533..67688e875379000ea494ed2f214d3376228f1b84 100644 (file)
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -1837,41 +1837,41 @@ static PyMethodDef connection_methods[] = {
     {"rollback", (PyCFunction)pysqlite_connection_rollback, METH_NOARGS,
         PyDoc_STR("Roll back the current transaction.")},
     {"create_function", (PyCFunction)(void(*)(void))pysqlite_connection_create_function, METH_VARARGS|METH_KEYWORDS,
-        PyDoc_STR("Creates a new function. Non-standard.")},
+        PyDoc_STR("Creates a new function.")},
     {"create_aggregate", (PyCFunction)(void(*)(void))pysqlite_connection_create_aggregate, METH_VARARGS|METH_KEYWORDS,
-        PyDoc_STR("Creates a new aggregate. Non-standard.")},
+        PyDoc_STR("Creates a new aggregate.")},
     {"set_authorizer", (PyCFunction)(void(*)(void))pysqlite_connection_set_authorizer, METH_VARARGS|METH_KEYWORDS,
-        PyDoc_STR("Sets authorizer callback. Non-standard.")},
+        PyDoc_STR("Sets authorizer callback.")},
     #ifdef HAVE_LOAD_EXTENSION
     {"enable_load_extension", (PyCFunction)pysqlite_enable_load_extension, METH_VARARGS,
-        PyDoc_STR("Enable dynamic loading of SQLite extension modules. Non-standard.")},
+        PyDoc_STR("Enable dynamic loading of SQLite extension modules.")},
     {"load_extension", (PyCFunction)pysqlite_load_extension, METH_VARARGS,
-        PyDoc_STR("Load SQLite extension module. Non-standard.")},
+        PyDoc_STR("Load SQLite extension module.")},
     #endif
     {"set_progress_handler", (PyCFunction)(void(*)(void))pysqlite_connection_set_progress_handler, METH_VARARGS|METH_KEYWORDS,
-        PyDoc_STR("Sets progress handler callback. Non-standard.")},
+        PyDoc_STR("Sets progress handler callback.")},
     {"set_trace_callback", (PyCFunction)(void(*)(void))pysqlite_connection_set_trace_callback, METH_VARARGS|METH_KEYWORDS,
-        PyDoc_STR("Sets a trace callback called for each SQL statement (passed as unicode). Non-standard.")},
+        PyDoc_STR("Sets a trace callback called for each SQL statement (passed as unicode).")},
     {"execute", (PyCFunction)pysqlite_connection_execute, METH_VARARGS,
-        PyDoc_STR("Executes a SQL statement. Non-standard.")},
+        PyDoc_STR("Executes an SQL statement.")},
     {"executemany", (PyCFunction)pysqlite_connection_executemany, METH_VARARGS,
-        PyDoc_STR("Repeatedly executes a SQL statement. Non-standard.")},
+        PyDoc_STR("Repeatedly executes an SQL statement.")},
     {"executescript", (PyCFunction)pysqlite_connection_executescript, METH_VARARGS,
-        PyDoc_STR("Executes a multiple SQL statements at once. Non-standard.")},
+        PyDoc_STR("Executes a multiple SQL statements at once.")},
     {"create_collation", (PyCFunction)pysqlite_connection_create_collation, METH_VARARGS,
-        PyDoc_STR("Creates a collation function. Non-standard.")},
+        PyDoc_STR("Creates a collation function.")},
     {"interrupt", (PyCFunction)pysqlite_connection_interrupt, METH_NOARGS,
-        PyDoc_STR("Abort any pending database operation. Non-standard.")},
+        PyDoc_STR("Abort any pending database operation.")},
     {"iterdump", (PyCFunction)pysqlite_connection_iterdump, METH_NOARGS,
-        PyDoc_STR("Returns iterator to the dump of the database in an SQL text format. Non-standard.")},
+        PyDoc_STR("Returns iterator to the dump of the database in an SQL text format.")},
     #ifdef HAVE_BACKUP_API
     {"backup", (PyCFunction)(void(*)(void))pysqlite_connection_backup, METH_VARARGS | METH_KEYWORDS,
-        PyDoc_STR("Makes a backup of the database. Non-standard.")},
+        PyDoc_STR("Makes a backup of the database.")},
     #endif
     {"__enter__", (PyCFunction)pysqlite_connection_enter, METH_NOARGS,
-        PyDoc_STR("For context manager. Non-standard.")},
+        PyDoc_STR("For context manager.")},
     {"__exit__", (PyCFunction)pysqlite_connection_exit, METH_VARARGS,
-        PyDoc_STR("For context manager. Non-standard.")},
+        PyDoc_STR("For context manager.")},
     {NULL, NULL}
 };
 

diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index dd0ce7e1ea6a3368d3e892bcc1c437f4f6f741ca..c6d5a9a2af897a38e71c87a4a76c731bcff2d130 100644 (file)
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -882,7 +882,7 @@ static PyMethodDef cursor_methods[] = {
     {"executemany", (PyCFunction)pysqlite_cursor_executemany, METH_VARARGS,
         PyDoc_STR("Repeatedly executes a SQL statement.")},
     {"executescript", (PyCFunction)pysqlite_cursor_executescript, METH_VARARGS,
-        PyDoc_STR("Executes a multiple SQL statements at once. Non-standard.")},
+        PyDoc_STR("Executes a multiple SQL statements at once.")},
     {"fetchone", (PyCFunction)pysqlite_cursor_fetchone, METH_NOARGS,
         PyDoc_STR("Fetches one row from the resultset.")},
     {"fetchmany", (PyCFunction)(void(*)(void))pysqlite_cursor_fetchmany, METH_VARARGS|METH_KEYWORDS,

diff --git a/Modules/_sqlite/microprotocols.h b/Modules/_sqlite/microprotocols.h
index 5418c2b98fd7519dd235f40d146a2a0069f6281e..68c18d9355a6f555a53a889fed43d06578325506 100644 (file)
--- a/Modules/_sqlite/microprotocols.h
+++ b/Modules/_sqlite/microprotocols.h
@@ -47,6 +47,6 @@ extern PyObject *pysqlite_microprotocols_adapt(
 extern PyObject *
     pysqlite_adapt(pysqlite_Cursor* self, PyObject *args);
 #define pysqlite_adapt_doc \
-    "adapt(obj, protocol, alternate) -> adapt obj to given protocol. Non-standard."
+    "adapt(obj, protocol, alternate) -> adapt obj to given protocol."
 
 #endif /* !defined(PSYCOPG_MICROPROTOCOLS_H) */

diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
index 44811835d42fca9d636caf095406c09fed2c8b79..98909369e755a9a30acfadeb06742807fbcc8006 100644 (file)
--- a/Modules/_sqlite/module.c
+++ b/Modules/_sqlite/module.c
@@ -121,7 +121,7 @@ static PyObject* module_complete(PyObject* self, PyObject* args, PyObject*
 PyDoc_STRVAR(module_complete_doc,
 "complete_statement(sql)\n\
 \n\
-Checks if a string contains a complete SQL statement. Non-standard.");
+Checks if a string contains a complete SQL statement.");
 
 #ifdef HAVE_SHARED_CACHE
 static PyObject* module_enable_shared_cache(PyObject* self, PyObject* args, PyObject*
@@ -149,8 +149,7 @@ static PyObject* module_enable_shared_cache(PyObject* self, PyObject* args, PyOb
 PyDoc_STRVAR(module_enable_shared_cache_doc,
 "enable_shared_cache(do_enable)\n\
 \n\
-Enable or disable shared cache mode for the calling thread.\n\
-Experimental/Non-standard.");
+Enable or disable shared cache mode for the calling thread.");
 #endif /* HAVE_SHARED_CACHE */
 
 static PyObject* module_register_adapter(PyObject* self, PyObject* args)
@@ -180,7 +179,7 @@ static PyObject* module_register_adapter(PyObject* self, PyObject* args)
 PyDoc_STRVAR(module_register_adapter_doc,
 "register_adapter(type, callable)\n\
 \n\
-Registers an adapter with pysqlite's adapter registry. Non-standard.");
+Registers an adapter with sqlite3's adapter registry.");
 
 static PyObject* module_register_converter(PyObject* self, PyObject* args)
 {
@@ -214,7 +213,7 @@ error:
 PyDoc_STRVAR(module_register_converter_doc,
 "register_converter(typename, callable)\n\
 \n\
-Registers a converter with pysqlite. Non-standard.");
+Registers a converter with sqlite3.");
 
 static PyObject* enable_callback_tracebacks(PyObject* self, PyObject* args)
 {