[SQL-CVS] r1951 - in SQLObject/trunk/sqlobject: . sqlite

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

Author: phd
Date: 2006-09-26 08:22:23 -0600 (Tue, 26 Sep 2006)
New Revision: 1951

Modified:
   SQLObject/trunk/sqlobject/col.py
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
Log:
A patch by Humberto Diogenes http://humberto.digi.com.br
to use sqlite3 (builtin module in Python 2.5).


Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py	2006-09-26 12:30:07 UTC (rev 1950)
+++ SQLObject/trunk/sqlobject/col.py	2006-09-26 14:22:23 UTC (rev 1951)
@@ -1253,9 +1253,9 @@
         if value is None:
             return None
         if isinstance(value, str):
-            module = state.soObject._connection.module
-            if module.__name__ in ("sqlite", "pysqlite2.dbapi2"):
-                value = module.decode(value)
+            connection = state.soObject._connection
+            if connection.dbName == "sqlite":
+                value = connection.module.decode(value)
             return value
         if isinstance(value, (buffer_type, state.soObject._connection._binaryType)):
             cachedValue = self._cachedValue

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2006-09-26 12:30:07 UTC (rev 1950)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2006-09-26 14:22:23 UTC (rev 1951)
@@ -17,11 +17,15 @@
         global using_sqlite2
         if sqlite is None:
             try:
-                from pysqlite2 import dbapi2 as sqlite
+                import sqlite3 as sqlite
                 using_sqlite2 = True
             except ImportError:
-                import sqlite
-                using_sqlite2 = False
+                try:
+                    from pysqlite2 import dbapi2 as sqlite
+                    using_sqlite2 = True
+                except ImportError:
+                    import sqlite
+                    using_sqlite2 = False
         self.module = sqlite
         self.filename = filename  # full path to sqlite-db-file
         self._memory = filename == ':memory:'