#13934: document sqlite version strings, use correct one in test.

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 93f6d825f2700204ffbcd1dfd6a7ad42848b97f7..28edfcff215a8c7b7aab3beef4a66254f0443e5e 100644 (file)
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -109,6 +109,28 @@ Module functions and constants
 ------------------------------
 
 
+.. data:: version
+
+   The version number of this module, as a string. This is not the version of
+   the SQLite library.
+
+
+.. data:: version_info
+
+   The version number of this module, as a tuple of integers. This is not the
+   version of the SQLite library.
+
+
+.. data:: sqlite_version
+
+   The version number of the run-time SQLite library, as a string.
+
+
+.. data:: sqlite_version_info
+
+   The version number of the run-time SQLite library, as a tuple of integers.
+
+
 .. data:: PARSE_DECLTYPES
 
    This constant is meant to be used with the *detect_types* parameter of the

diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
index a92e8387861c023271d9bb15720117432ba1fc57..0ec3b43c7bba3f57d9825812ee4a3f020dbf2f79 100644 (file)
--- a/Lib/sqlite3/test/hooks.py
+++ b/Lib/sqlite3/test/hooks.py
@@ -47,9 +47,9 @@ class CollationTests(unittest.TestCase):
         except sqlite.ProgrammingError as e:
             pass
 
+    @unittest.skipIf(sqlite.sqlite_version_info < (3, 2, 1),
+                     'old SQLite versions crash on this test')
     def CheckCollationIsUsed(self):
-        if sqlite.version_info < (3, 2, 1):  # old SQLite versions crash on this test
-            return
         def mycoll(x, y):
             # reverse order
             return -((x > y) - (x < y))