From 9deaebf93cc6c4e515409ec82d558ae2f392405b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 4 Sep 2006 02:22:00 +0000 Subject: - import of py2.5s sqlite3 [ticket:293] --- lib/sqlalchemy/databases/sqlite.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/databases/sqlite.py') diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py index 7acc04880..2039e37e6 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): -- cgit v1.2.1