diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-11-02 20:51:28 +0000 | 
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-11-02 20:51:28 +0000 | 
| commit | 72780bae3377c45abb03cb62b638b84ed04375e2 (patch) | |
| tree | bf09b8f26fae7e797a2aeb9fc67babd1dd91da7e /lib/sqlalchemy/dialects/sqlite/pysqlite.py | |
| parent | fc5c54fcd4d868c2a4c7ac19668d72f506fe821e (diff) | |
| parent | 36e7aebd8d6faac77570403e99f9aa7b2330fa59 (diff) | |
| download | sqlalchemy-72780bae3377c45abb03cb62b638b84ed04375e2.tar.gz | |
Merge "First round of removal of python 2" into main
Diffstat (limited to 'lib/sqlalchemy/dialects/sqlite/pysqlite.py')
| -rw-r--r-- | lib/sqlalchemy/dialects/sqlite/pysqlite.py | 15 | 
1 files changed, 3 insertions, 12 deletions
| diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlite.py b/lib/sqlalchemy/dialects/sqlite/pysqlite.py index e9d5d9682..10912e0d5 100644 --- a/lib/sqlalchemy/dialects/sqlite/pysqlite.py +++ b/lib/sqlalchemy/dialects/sqlite/pysqlite.py @@ -454,23 +454,14 @@ class SQLiteDialect_pysqlite(SQLiteDialect):          },      ) -    if not util.py2k: -        description_encoding = None +    description_encoding = None      driver = "pysqlite"      @classmethod      def dbapi(cls): -        if util.py2k: -            try: -                from pysqlite2 import dbapi2 as sqlite -            except ImportError: -                try: -                    from sqlite3 import dbapi2 as sqlite -                except ImportError as e: -                    raise e -        else: -            from sqlite3 import dbapi2 as sqlite +        from sqlite3 import dbapi2 as sqlite +          return sqlite      @classmethod | 
