From 3f7beb99dd456dd2b8de45a5cb0e1afdf228a262 Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Thu, 10 Jan 2013 20:18:21 -0500
Subject: #13934: document sqlite version strings, use correct one in test.

---
 Doc/library/sqlite3.rst   | 22 ++++++++++++++++++++++
 Lib/sqlite3/test/hooks.py |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 93f6d82..28edfcf 100644
--- 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 a92e838..0ec3b43 100644
--- 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))
-- 
cgit v0.12