From 9deaebf93cc6c4e515409ec82d558ae2f392405b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 4 Sep 2006 02:22:00 +0000 Subject: [PATCH] - import of py2.5s sqlite3 [ticket:293] --- CHANGES | 1 + lib/sqlalchemy/databases/sqlite.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index f99cd35460..24898b0275 100644 --- a/CHANGES +++ b/CHANGES @@ -63,6 +63,7 @@ against datetimes that dont). - fix to using query.count() with distinct, **kwargs with SelectResults count() [ticket:287] - deregister Table from MetaData when autoload fails; [ticket:289] +- import of py2.5s sqlite3 [ticket:293] 0.2.7 - quoting facilities set up so that database-specific quoting can be diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py index 7acc048808..2039e37e6e 100644 --- a/lib/sqlalchemy/databases/sqlite.py +++ b/lib/sqlalchemy/databases/sqlite.py @@ -16,11 +16,14 @@ pysqlite2_timesupport = False # Change this if the init.d guys ever get around try: from pysqlite2 import dbapi2 as sqlite -except: +except ImportError: try: - sqlite = __import__('sqlite') # skip ourselves - except: - sqlite = None + from sqlite3 import dbapi2 as sqlite #try the 2.5+ stdlib name. + except ImportError: + try: + sqlite = __import__('sqlite') # skip ourselves + except: + sqlite = None class SLNumeric(sqltypes.Numeric): def get_col_spec(self): -- 2.47.2