[SQL-CVS] r3769 - in SQLObject/trunk: docs sqlobject/sqlite

[<sub...@co...>]

Author: phd
Date: 2009-01-13 09:36:15 -0700 (Tue, 13 Jan 2009)
New Revision: 3769

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
Log:
Changed the order of testing of SQLite modules - look for external PySQLite2 before sqlite3.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-01-10 02:10:18 UTC (rev 3768)
+++ SQLObject/trunk/docs/News.txt	2009-01-13 16:36:15 UTC (rev 3769)
@@ -43,6 +43,9 @@
   indicate no password set. By default, it uses the md5 library for
   hashing, but this can be changed in a HashCol definition.
 
+* Changed the order of testing of SQLite modules - look for external
+  PySQLite2 before sqlite3.
+
 SQLObject 0.10.5
 ================
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-01-10 02:10:18 UTC (rev 3768)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-01-13 16:36:15 UTC (rev 3769)
@@ -28,11 +28,11 @@
         global using_sqlite2
         if sqlite is None:
             try:
-                import sqlite3 as sqlite
+                from pysqlite2 import dbapi2 as sqlite
                 using_sqlite2 = True
             except ImportError:
                 try:
-                    from pysqlite2 import dbapi2 as sqlite
+                    import sqlite3 as sqlite
                     using_sqlite2 = True
                 except ImportError:
                     import sqlite