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

[scm-commit@wald.intevation.org]

Author: dpinte
Date: 2006-06-29 15:50:16 +0200 (Thu, 29 Jun 2006)
New Revision: 2687

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

    * Thuban/version.py: Bugfix determination of SQLite, the wright one !



Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2006-06-28 15:35:46 UTC (rev 2686)
+++ trunk/thuban/ChangeLog	2006-06-29 13:50:16 UTC (rev 2687)
@@ -1,3 +1,7 @@
+2006-06-29 Didrik Pinte <dpinte at itae.be>
+
+	* Thuban/version.py: Bugfix determination of SQLite, the wright one !
+	  
 2006-06-28 Didrik Pinte <dpinte at itae.be>
 
 	* packaging/windows/thubanstart.py: sample file loading all the stable

Modified: trunk/thuban/Thuban/version.py
===================================================================
--- trunk/thuban/Thuban/version.py	2006-06-28 15:35:46 UTC (rev 2686)
+++ trunk/thuban/Thuban/version.py	2006-06-29 13:50:16 UTC (rev 2687)
@@ -113,20 +113,20 @@
 # 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:
     from pysqlite2._sqlite import sqlite_version
+    versions['sqlite'] = sqlite_version
+    versions['sqlite-tuple'] = make_tuple(sqlite_version)
 except ImportError:
     from _sqlite import sqlite_version
-versions['sqlite'] = sqlite_version()
-versions['sqlite-tuple'] = make_tuple(sqlite_version())
+    versions['sqlite'] = sqlite_version()
+    versions['sqlite-tuple'] = make_tuple(sqlite_version())
 
 # GDAL
 from  Thuban.Model.resource import has_gdal_support