[Thuban-commits] r2685 - in trunk/thuban: . Thuban

[scm-commit@wald.intevation.org]

Author: dpinte
Date: 2006-06-28 17:34:04 +0200 (Wed, 28 Jun 2006)
New Revision: 2685

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/Thuban/version.py
Log:
2006-06-28 Didrik Pinte <dpinte at itae.be>

    * Thuban/version.py: Bugfix determination of SQLite on old and recent
        systems (support pysqlite1 and pysqlite2)



Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2006-06-27 16:11:35 UTC (rev 2684)
+++ trunk/thuban/ChangeLog	2006-06-28 15:34:04 UTC (rev 2685)
@@ -1,3 +1,8 @@
+2006-06-28 Didrik Pinte <dpinte at itae.be>
+
+	* Thuban/version.py: Bugfix determination of SQLite on old and recent
+	systems (support pysqlite1 and pysqlite2)
+
 2006-06-27 Frank Koormann <frank at intevation.de>
 
 	* Thuban/version.py: Bugfix determination of SQLite on old systems.

Modified: trunk/thuban/Thuban/version.py
===================================================================
--- trunk/thuban/Thuban/version.py	2006-06-27 16:11:35 UTC (rev 2684)
+++ trunk/thuban/Thuban/version.py	2006-06-28 15:34:04 UTC (rev 2685)
@@ -113,10 +113,12 @@
 # PySQLite
 try:
     from pysqlite2 import dbapi2 as sqlite
+    versions['pysqlite'] = sqlite.version
+    versions['pysqlite-tuple'] = make_tuple(sqlite.version)
 except ImportError:
     import sqlite
-versions['pysqlite'] = sqlite.version
-versions['pysqlite-tuple'] = make_tuple(sqlite.version)
+    versions['pysqlite'] = sqlite.version()
+    versions['pysqlite-tuple'] = make_tuple(sqlite.version())
 
 # SQLite
 try: