Address more of CAM's remarks

python · erlend-aasland · Nov 12, 2022 · Jun 11, 2022 · Jun 14, 2022 · Jun 14, 2022
commit 7de6bf38a70b52e5452100089c838672a8a6b5c7
@@ -296,7 +296,7 @@ Module functions
        Can be ``"DEFERRED"`` (default), ``"EXCLUSIVE"`` or ``"IMMEDIATE"``;
        or ``None`` to disable opening transactions implicitly.
        Has no effect unless :attr:`Connection.autocommit` is set to
-       :data:`~sqlite3.LEGACY_TRANSACTION_CONTROL`.
+       :data:`~sqlite3.LEGACY_TRANSACTION_CONTROL` (the default).
    :type isolation_level: str | None
 
    :param bool check_same_thread:
@@ -1308,16 +1308,18 @@ Connection objects
       If set to ``None``, transactions are never implicitly opened.
       If set to one of ``"DEFERRED"``, ``"IMMEDIATE"``, or ``"EXCLUSIVE"``,
       corresponding to the underlying `SQLite transaction behaviour`_,
-      implicit :ref:`transaction management
+      :ref:`implicit transaction management
       <sqlite3-transaction-control-isolation-level>` is performed.
 
       If not overridden by the *isolation_level* parameter of :func:`connect`,
       the default is ``""``, which is an alias for ``"DEFERRED"``.
 
-      Using :attr:`autocommit` to control transaction handling is recommended
-      over using :attr:`!isolation_level`.
-      :attr:`!isolation_level` has no effect unless :attr:`autocommit` is set
-      to :data:`LEGACY_TRANSACTION_CONTROL`.
+      .. note::
+
+         Using :attr:`autocommit` to control transaction handling is
+         recommended over using :attr:`!isolation_level`.
+         :attr:`!isolation_level` has no effect unless :attr:`autocommit` is
+         set to :data:`LEGACY_TRANSACTION_CONTROL` (the default).
 
    .. attribute:: row_factory
 
@@ -2389,22 +2391,6 @@ to leave transaction control behaviour to the
 :attr:`Connection.isolation_level` attribute.
 See :ref:`sqlite3-transaction-control-isolation-level` for more information.
 
-.. note::
-
-   :attr:`~Connection.autocommit` and SQLite's `autocommit mode`_
-   are not linked.
-   For example, explicitly issuing a ``BEGIN`` statement when
-   :attr:`!autocommit` is ``True`` will not change the value of
-   the *autocommit* attribute.
-
-   Use :attr:`Connection.in_transaction` to query the low-level SQLite
-   autocommit mode.
-
-.. note::
-
-   The :attr:`Connection.isolation_level` attribute has no effect unless
-   :attr:`Connection.autocommit` is :data:`LEGACY_TRANSACTION_CONTROL`.
-
 
 .. _sqlite3-transaction-control-isolation-level:
 
@@ -2420,8 +2406,8 @@ Transaction control via the ``isolation_level`` attribute
 If :attr:`Connection.autocommit` is set to
 :data:`LEGACY_TRANSACTION_CONTROL`,
 transaction behaviour is controlled using
-the :attr:`Connection.isolation_level` attribute,
-else it has no effect.
+the :attr:`Connection.isolation_level` attribute.
+Otherwise, :attr:`!isolation_level` has no effect.
 
 If the connection attribute :attr:`~Connection.isolation_level`
 is not ``None``,

@@ -369,7 +369,7 @@ def test_isolation_level_none(self):
 
 class AutocommitAttribute(unittest.TestCase):
     """Test PEP 249-compliant autocommit behaviour."""
-    compat = sqlite.LEGACY_TRANSACTION_CONTROL
+    legacy = sqlite.LEGACY_TRANSACTION_CONTROL
 
     @contextmanager
     def check_stmt_trace(self, cx, expected, reset=True):
@@ -483,7 +483,7 @@ def test_autocommit_disabled_ctx_mgr(self):
 
     def test_autocommit_compat_ctx_mgr(self):
         expected = ["BEGIN ", "INSERT INTO T VALUES(1)", "COMMIT"]
-        with memory_database(autocommit=self.compat) as cx:
+        with memory_database(autocommit=self.legacy) as cx:
             cx.execute("create table t(t)")
             with self.check_stmt_trace(cx, expected):
                 with cx:
@@ -511,7 +511,7 @@ def test_autocommit_disabled_executescript(self):
 
     def test_autocommit_compat_executescript(self):
         expected = ["BEGIN", "COMMIT", "SELECT 1"]
-        with memory_database(autocommit=self.compat) as cx:
+        with memory_database(autocommit=self.legacy) as cx:
             with self.check_stmt_trace(cx, expected):
                 self.assertFalse(cx.in_transaction)
                 cx.execute("BEGIN")

diff --git a/Misc/NEWS.d/next/Library/2022-06-14-22-46-05.gh-issue-83638.73xfGK.rst b/Misc/NEWS.d/next/Library/2022-06-14-22-46-05.gh-issue-83638.73xfGK.rst
@@ -1,6 +1,6 @@
 Add the :attr:`~sqlite3.Connection.autocommit` attribute
-to :class:`~sqlite3.Connection`
-and the *autocommit* parameter to :func:`~sqlite3.connect`
+to :class:`sqlite3.Connection`
+and the *autocommit* parameter to :func:`sqlite3.connect`
 to control :pep:`249`-compliant
 :ref:`transaction handling <sqlite3-transaction-control-autocommit>`.
 Patch by Erlend E. Aasland.
@@ -106,7 +106,7 @@ autocommit_converter(PyObject *val, enum autocommit_mode *result)
     if (PyLong_Check(val) &&
         PyLong_AsLong(val) == LEGACY_TRANSACTION_CONTROL)
     {
-        *result = AUTOCOMMIT_COMPAT;
+        *result = AUTOCOMMIT_LEGACY;
         return 1;
     }
 
@@ -601,7 +601,7 @@ pysqlite_connection_commit_impl(pysqlite_Connection *self)
         return NULL;
     }
 
-    if (self->autocommit == AUTOCOMMIT_COMPAT) {
+    if (self->autocommit == AUTOCOMMIT_LEGACY) {
         if (!sqlite3_get_autocommit(self->db)) {
             if (connection_exec_stmt(self, "COMMIT") < 0) {
                 return NULL;
@@ -635,7 +635,7 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self)
         return NULL;
     }
 
-    if (self->autocommit == AUTOCOMMIT_COMPAT) {
+    if (self->autocommit == AUTOCOMMIT_LEGACY) {
         if (!sqlite3_get_autocommit(self->db)) {
             if (connection_exec_stmt(self, "ROLLBACK") < 0) {
                 return NULL;

@@ -40,7 +40,7 @@ typedef struct _callback_context
 } callback_context;
 
 enum autocommit_mode {
-    AUTOCOMMIT_COMPAT = LEGACY_TRANSACTION_CONTROL,
+    AUTOCOMMIT_LEGACY = LEGACY_TRANSACTION_CONTROL,
     AUTOCOMMIT_ENABLED = 1,
     AUTOCOMMIT_DISABLED = 0,
 };

@@ -855,7 +855,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
 
     /* We start a transaction implicitly before a DML statement.
        SELECT is the only exception. See #9924. */
-    if (self->connection->autocommit == AUTOCOMMIT_COMPAT
+    if (self->connection->autocommit == AUTOCOMMIT_LEGACY
         && self->connection->isolation_level
         && self->statement->is_dml
         && sqlite3_get_autocommit(self->connection->db))
@@ -1034,7 +1034,7 @@ pysqlite_cursor_executescript_impl(pysqlite_Cursor *self,
 
     // Commit if needed
     sqlite3 *db = self->connection->db;
-    if (self->connection->autocommit == AUTOCOMMIT_COMPAT
+    if (self->connection->autocommit == AUTOCOMMIT_LEGACY
         && !sqlite3_get_autocommit(db))
     {
         int rc = SQLITE_OK;