diff options
author | Federico Caselli <cfederico87@gmail.com> | 2021-11-21 21:17:27 +0100 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-11-24 22:51:27 -0500 |
commit | 31acba8ff7c123a20ae308b7f4ab6df3df264b48 (patch) | |
tree | a4c39a2123e1b95edf17995ba85bb69ee619f6e4 /lib/sqlalchemy/dialects/sqlite/pysqlcipher.py | |
parent | d3a4e96196cd47858de072ae589c6554088edc24 (diff) | |
download | sqlalchemy-31acba8ff7c123a20ae308b7f4ab6df3df264b48.tar.gz |
Clean up most py3k compat
Change-Id: I8172fdcc3103ff92aa049827728484c8779af6b7
Diffstat (limited to 'lib/sqlalchemy/dialects/sqlite/pysqlcipher.py')
-rw-r--r-- | lib/sqlalchemy/dialects/sqlite/pysqlcipher.py | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py b/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py index 3765191c1..d3c504fd4 100644 --- a/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py +++ b/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py @@ -94,11 +94,8 @@ time, at the expense of slower startup time for new connections. """ # noqa -from __future__ import absolute_import - from .pysqlite import SQLiteDialect_pysqlite from ... import pool -from ... import util class SQLiteDialect_pysqlcipher(SQLiteDialect_pysqlite): @@ -109,18 +106,14 @@ class SQLiteDialect_pysqlcipher(SQLiteDialect_pysqlite): @classmethod def dbapi(cls): - if util.py3k: - try: - import sqlcipher3 as sqlcipher - except ImportError: - pass - else: - return sqlcipher - - from pysqlcipher3 import dbapi2 as sqlcipher - + try: + import sqlcipher3 as sqlcipher + except ImportError: + pass else: - from pysqlcipher import dbapi2 as sqlcipher + return sqlcipher + + from pysqlcipher3 import dbapi2 as sqlcipher return sqlcipher |