Cosmetic fixes

Author: berkerpeksag

Doc/library/sqlite3.rst

@@ -535,7 +535,7 @@ Connection Objects
    .. method:: backup(target, *, pages=0, progress=None, name="main", sleep=0.250)
 
       This method makes a backup of a SQLite database even while it's being accessed
-      by other clients, or concurrently by the same connection. The copy will be
+      by other clients, or concurrently by the same connection.  The copy will be
       written into the mandatory argument *target*, that must be another
       :class:`Connection` instance.
 
@@ -551,7 +551,8 @@ Connection Objects
       The *name* argument specifies the database name that will be copied: it must be
       a string containing either ``"main"``, the default, to indicate the main
       database, ``"temp"`` to indicate the temporary database or the name specified
-      after the ``AS`` keyword in an ``ATTACH`` statement for an attached database.
+      after the ``AS`` keyword in an ``ATTACH DATABASE`` statement for an attached
+      database.
 
       The *sleep* argument specifies the number of seconds to sleep by between
       successive attempts to backup remaining pages, can be specified either as an
@@ -562,7 +563,7 @@ Connection Objects
          import sqlite3
 
          def progress(status, remaining, total):
-             print(f"Copied {total-remaining} of {total} pages...")
+             print(f'Copied {total-remaining} of {total} pages...')
 
          con = sqlite3.connect('existing_db.db')
          with sqlite3.connect('backup.db') as bck:
@@ -576,10 +577,9 @@ Connection Objects
          dest = sqlite3.connect(':memory:')
          source.backup(dest)
 
-      .. note:: This is available only when the underlying SQLite library is at
-                version 3.6.11 or higher.
+      Availability: SQLite 3.6.11 or higher
 
-      .. versionadded:: 3.7
+      .. versionadded:: 3.8
 
 
 .. _sqlite3-cursor-objects:

Lib/sqlite3/test/backup.py

@@ -1,8 +1,6 @@
 import sqlite3 as sqlite
 import unittest
 
-from test import support
-
 
 @unittest.skipIf(sqlite.sqlite_version_info < (3, 6, 11), "Backup API not supported")
 class BackupTests(unittest.TestCase):
@@ -42,8 +40,10 @@ def test_bad_target_in_transaction(self):
         bck = sqlite.connect(':memory:')
         bck.execute('CREATE TABLE bar (key INTEGER)')
         bck.executemany('INSERT INTO bar (key) VALUES (?)', [(3,), (4,)])
-        with self.assertRaises(sqlite.OperationalError):
+        with self.assertRaises(sqlite.OperationalError) as cm:
             self.cx.backup(bck)
+        if sqlite.sqlite_version_info < (3, 8, 7):
+            self.assertEqual(str(cm.exception), 'target is in transaction')
 
     def test_keyword_only_args(self):
         with self.assertRaises(TypeError):
@@ -96,10 +96,10 @@ def progress(status, remaining, total):
         self.assertEqual(journal[0], 0)
 
     def test_non_callable_progress(self):
-        with self.assertRaises(TypeError) as err:
+        with self.assertRaises(TypeError) as cm:
             with sqlite.connect(':memory:') as bck:
                 self.cx.backup(bck, pages=1, progress='bar')
-        self.assertEqual(str(err.exception), 'progress argument must be a callable')
+        self.assertEqual(str(cm.exception), 'progress argument must be a callable')
 
     def test_modifying_progress(self):
         journal = []
@@ -138,9 +138,10 @@ def test_database_source_name(self):
             self.cx.backup(bck, name='main')
         with sqlite.connect(':memory:') as bck:
             self.cx.backup(bck, name='temp')
-        with self.assertRaises(sqlite.OperationalError):
+        with self.assertRaises(sqlite.OperationalError) as cm:
             with sqlite.connect(':memory:') as bck:
                 self.cx.backup(bck, name='non-existing')
+        self.assertEqual(str(cm.exception), 'SQL logic error or missing database')
 
         self.cx.execute("ATTACH DATABASE ':memory:' AS attached_db")
         self.cx.execute('CREATE TABLE attached_db.foo (key INTEGER)')
@@ -150,7 +151,7 @@ def test_database_source_name(self):
             self.cx.backup(bck, name='attached_db')
             self.verify_backup(bck)
 
-# Used by the Lib/test/test_sqlite.py
+
 def suite():
     return unittest.makeSuite(BackupTests)
 

Misc/NEWS.d/next/Library/2017-10-05-20-41-48.bpo-27645.1Y_Wag.rst

@@ -1,2 +1,3 @@
-sqlite3.Connection now exposes a backup() method, if the underlying SQLite
-library is at version 3.6.11 or higher. Patch by Lele Gaifax.
+:class:`sqlite3.Connection` now exposes a :class:`~sqlite3.Connection.backup`
+method, if the underlying SQLite library is at version 3.6.11
+or higher.  Patch by Lele Gaifax.

Modules/_sqlite/connection.c

@@ -1554,19 +1554,21 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *args, PyObject *
             PyErr_SetString(pysqlite_OperationalError, sqlite3_errstr(rc));
 #else
             switch (rc) {
-            case SQLITE_READONLY:
-                PyErr_SetString(pysqlite_OperationalError,
-                                "attempt to write a readonly database");
-                break;
-            case SQLITE_BUSY:
-                PyErr_SetString(pysqlite_OperationalError, "database is locked");
-                break;
-            case SQLITE_LOCKED:
-                PyErr_SetString(pysqlite_OperationalError, "database table is locked");
-                break;
-            default:
-                PyErr_Format(pysqlite_OperationalError, "unrecognized error code: %d", rc);
-                break;
+                case SQLITE_READONLY:
+                    PyErr_SetString(pysqlite_OperationalError,
+                                    "attempt to write a readonly database");
+                    break;
+                case SQLITE_BUSY:
+                    PyErr_SetString(pysqlite_OperationalError, "database is locked");
+                    break;
+                case SQLITE_LOCKED:
+                    PyErr_SetString(pysqlite_OperationalError,
+                                    "database table is locked");
+                    break;
+                default:
+                    PyErr_Format(pysqlite_OperationalError,
+                                 "unrecognized error code: %d", rc);
+                    break;
             }
 #endif
         }