1.6.1dev: adapt to removed version_info and version of sqlite3 module in Python 3.14 (closes #13607)

git-svn-id: http://trac.edgewall.org/intertrac/log:/branches/1.6-stable@17914 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: jomae

contrib/make_status.py

@@ -57,8 +57,7 @@ def _pysqlite3_version():
     ("Jinja2",            'jinja2.__version__'),
     ("multipart",         'multipart.__version__'),
     ("Babel",             'babel.__version__'),
-    ("sqlite3",           ('sqlite3.version',
-                           'sqlite3.sqlite_version')),
+    ("sqlite3",           'sqlite3.sqlite_version'),
     ("PySqlite3",         ('__main__._pysqlite3_version()',
                            'pysqlite3.dbapi2.sqlite_version')),
     ("PyMySQL",           'pymysql.__version__'),

trac/db/sqlite_backend.py

@@ -37,13 +37,13 @@
     import pysqlite3.dbapi2 as sqlite
 except ImportError:
     import sqlite3 as sqlite
+    pysqlite3_version = None
+else:
+    pysqlite3_version = get_pkginfo(sqlite).get('version', '%d.%d.%s' %
+                                                           sqlite.version_info)
 
 sqlite_version = sqlite.sqlite_version_info
 sqlite_version_string = sqlite.sqlite_version
-pysqlite_version = sqlite.version_info
-pysqlite_version_string = get_pkginfo(sqlite).get('version',
-                                                  '%d.%d.%s'
-                                                  % pysqlite_version)
 min_sqlite_version = (3, 0, 0)
 
 
@@ -273,7 +273,8 @@ def backup(self, dest_file):
 
     def get_system_info(self):
         yield 'SQLite', sqlite_version_string
-        yield 'pysqlite', pysqlite_version_string
+        if pysqlite3_version:
+            yield 'pysqlite3', pysqlite3_version
 
     @lazy
     def _extensions(self):

trac/tests/env.py

@@ -520,8 +520,6 @@ def get_info(system_info, name):
             self.assertEqual(info_before, info_after)
             self.assertRegex(get_info(info_before, 'SQLite'),
                              r'^\d+(\.\d+)+$')
-            self.assertRegex(get_info(info_before, 'pysqlite'),
-                             r'^\d+(\.\d+)+$')
         else:
             self.fail("Unknown value for dburi %s" % self.env.dburi)