changeset: 81375:cdf9142a0c84 branch: 3.3 parent: 81372:c8105251cc1f parent: 81374:b8b26feb3e1a user: R David Murray date: Thu Jan 10 20:19:35 2013 -0500 files: Doc/library/sqlite3.rst Lib/sqlite3/test/hooks.py description: merge #13934: document sqlite version strings, use correct one in test. diff -r c8105251cc1f -r cdf9142a0c84 Doc/library/sqlite3.rst --- a/Doc/library/sqlite3.rst Thu Jan 10 14:16:20 2013 -0600 +++ b/Doc/library/sqlite3.rst Thu Jan 10 20:19:35 2013 -0500 @@ -109,6 +109,28 @@ ------------------------------ +.. 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 -r c8105251cc1f -r cdf9142a0c84 Lib/sqlite3/test/hooks.py --- a/Lib/sqlite3/test/hooks.py Thu Jan 10 14:16:20 2013 -0600 +++ b/Lib/sqlite3/test/hooks.py Thu Jan 10 20:19:35 2013 -0500 @@ -47,9 +47,9 @@ 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))