diff options
Diffstat (limited to 'lib/sqlalchemy/dialects')
19 files changed, 21 insertions, 21 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/pymssql.py b/lib/sqlalchemy/dialects/mssql/pymssql.py index 20d2b09db..8d654b72d 100644 --- a/lib/sqlalchemy/dialects/mssql/pymssql.py +++ b/lib/sqlalchemy/dialects/mssql/pymssql.py @@ -77,7 +77,7 @@ class MSDialect_pymssql(MSDialect): ) @classmethod - def dbapi(cls): + def import_dbapi(cls): module = __import__("pymssql") # pymmsql < 2.1.1 doesn't have a Binary method. we use string client_ver = tuple(int(x) for x in module.__version__.split(".")) @@ -106,7 +106,7 @@ class MSDialect_pymssql(MSDialect): port = opts.pop("port", None) if port and "host" in opts: opts["host"] = "%s:%s" % (opts["host"], port) - return [[], opts] + return ([], opts) def is_disconnect(self, e, connection, cursor): for msg in ( diff --git a/lib/sqlalchemy/dialects/mssql/pyodbc.py b/lib/sqlalchemy/dialects/mssql/pyodbc.py index 3af083a6a..0951f219b 100644 --- a/lib/sqlalchemy/dialects/mssql/pyodbc.py +++ b/lib/sqlalchemy/dialects/mssql/pyodbc.py @@ -538,7 +538,7 @@ class MSDialect_pyodbc(PyODBCConnector, MSDialect): # 2008. Before we had the VARCHAR cast above, pyodbc would also # fail on this query. return super(MSDialect_pyodbc, self)._get_server_version_info( - connection, allow_chars=False + connection ) else: version = [] diff --git a/lib/sqlalchemy/dialects/mysql/aiomysql.py b/lib/sqlalchemy/dialects/mysql/aiomysql.py index df716346e..d685b7ea1 100644 --- a/lib/sqlalchemy/dialects/mysql/aiomysql.py +++ b/lib/sqlalchemy/dialects/mysql/aiomysql.py @@ -276,7 +276,7 @@ class MySQLDialect_aiomysql(MySQLDialect_pymysql): is_async = True @classmethod - def dbapi(cls): + def import_dbapi(cls): return AsyncAdapt_aiomysql_dbapi( __import__("aiomysql"), __import__("pymysql") ) diff --git a/lib/sqlalchemy/dialects/mysql/asyncmy.py b/lib/sqlalchemy/dialects/mysql/asyncmy.py index 915b666bb..7d5b1bf86 100644 --- a/lib/sqlalchemy/dialects/mysql/asyncmy.py +++ b/lib/sqlalchemy/dialects/mysql/asyncmy.py @@ -288,7 +288,7 @@ class MySQLDialect_asyncmy(MySQLDialect_pymysql): is_async = True @classmethod - def dbapi(cls): + def import_dbapi(cls): return AsyncAdapt_asyncmy_dbapi(__import__("asyncmy")) @classmethod diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 5c2de0911..b2ccfc90f 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -2434,7 +2434,7 @@ class MySQLDialect(default.DefaultDialect): @classmethod def _is_mariadb_from_url(cls, url): - dbapi = cls.dbapi() + dbapi = cls.import_dbapi() dialect = cls(dbapi=dbapi) cargs, cparams = dialect.create_connect_args(url) diff --git a/lib/sqlalchemy/dialects/mysql/cymysql.py b/lib/sqlalchemy/dialects/mysql/cymysql.py index 9fd0b4a09..281c509b7 100644 --- a/lib/sqlalchemy/dialects/mysql/cymysql.py +++ b/lib/sqlalchemy/dialects/mysql/cymysql.py @@ -53,7 +53,7 @@ class MySQLDialect_cymysql(MySQLDialect_mysqldb): colspecs = util.update_copy(MySQLDialect.colspecs, {BIT: _cymysqlBIT}) @classmethod - def dbapi(cls): + def import_dbapi(cls): return __import__("cymysql") def _detect_charset(self, connection): diff --git a/lib/sqlalchemy/dialects/mysql/mariadbconnector.py b/lib/sqlalchemy/dialects/mysql/mariadbconnector.py index fca91204f..bf2b04251 100644 --- a/lib/sqlalchemy/dialects/mysql/mariadbconnector.py +++ b/lib/sqlalchemy/dialects/mysql/mariadbconnector.py @@ -111,7 +111,7 @@ class MySQLDialect_mariadbconnector(MySQLDialect): ) @classmethod - def dbapi(cls): + def import_dbapi(cls): return __import__("mariadb") def is_disconnect(self, e, connection, cursor): diff --git a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py index c96b739dc..a69dac9a5 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py +++ b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py @@ -77,7 +77,7 @@ class MySQLDialect_mysqlconnector(MySQLDialect): colspecs = util.update_copy(MySQLDialect.colspecs, {BIT: _myconnpyBIT}) @classmethod - def dbapi(cls): + def import_dbapi(cls): from mysql import connector return connector diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py index b4f071de0..6d66f88b4 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqldb.py +++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py @@ -159,7 +159,7 @@ class MySQLDialect_mysqldb(MySQLDialect): return False @classmethod - def dbapi(cls): + def import_dbapi(cls): return __import__("MySQLdb") def on_connect(self): diff --git a/lib/sqlalchemy/dialects/mysql/pymysql.py b/lib/sqlalchemy/dialects/mysql/pymysql.py index eddb9c921..9a240da61 100644 --- a/lib/sqlalchemy/dialects/mysql/pymysql.py +++ b/lib/sqlalchemy/dialects/mysql/pymysql.py @@ -57,7 +57,7 @@ class MySQLDialect_pymysql(MySQLDialect_mysqldb): return False @classmethod - def dbapi(cls): + def import_dbapi(cls): return __import__("pymysql") def create_connect_args(self, url, _translate_args=None): diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index a390099ae..98181051e 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -963,7 +963,7 @@ class OracleDialect_cx_oracle(OracleDialect): return (0, 0, 0) @classmethod - def dbapi(cls): + def import_dbapi(cls): import cx_Oracle return cx_Oracle diff --git a/lib/sqlalchemy/dialects/postgresql/asyncpg.py b/lib/sqlalchemy/dialects/postgresql/asyncpg.py index 4c3c47ba6..75f6c2704 100644 --- a/lib/sqlalchemy/dialects/postgresql/asyncpg.py +++ b/lib/sqlalchemy/dialects/postgresql/asyncpg.py @@ -878,7 +878,7 @@ class PGDialect_asyncpg(PGDialect): return (99, 99, 99) @classmethod - def dbapi(cls): + def import_dbapi(cls): return AsyncAdapt_asyncpg_dbapi(__import__("asyncpg")) @util.memoized_property diff --git a/lib/sqlalchemy/dialects/postgresql/pg8000.py b/lib/sqlalchemy/dialects/postgresql/pg8000.py index c23da93bb..372b8639e 100644 --- a/lib/sqlalchemy/dialects/postgresql/pg8000.py +++ b/lib/sqlalchemy/dialects/postgresql/pg8000.py @@ -426,7 +426,7 @@ class PGDialect_pg8000(PGDialect): return (99, 99, 99) @classmethod - def dbapi(cls): + def import_dbapi(cls): return __import__("pg8000") def create_connect_args(self, url): diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg.py b/lib/sqlalchemy/dialects/postgresql/psycopg.py index 3ba535d6c..33dc65afc 100644 --- a/lib/sqlalchemy/dialects/postgresql/psycopg.py +++ b/lib/sqlalchemy/dialects/postgresql/psycopg.py @@ -281,7 +281,7 @@ class PGDialect_psycopg(_PGDialect_common_psycopg): register_hstore(info, connection.connection) @classmethod - def dbapi(cls): + def import_dbapi(cls): import psycopg return psycopg @@ -592,7 +592,7 @@ class PGDialectAsync_psycopg(PGDialect_psycopg): supports_statement_cache = True @classmethod - def dbapi(cls): + def import_dbapi(cls): import psycopg from psycopg.pq import ExecStatus diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py index a08c5e5b0..dddce5a62 100644 --- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py +++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py @@ -612,7 +612,7 @@ class PGDialect_psycopg2(_PGDialect_common_psycopg): ) @classmethod - def dbapi(cls): + def import_dbapi(cls): import psycopg2 return psycopg2 diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py b/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py index 5a4dcb2e6..0943613a2 100644 --- a/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py +++ b/lib/sqlalchemy/dialects/postgresql/psycopg2cffi.py @@ -44,7 +44,7 @@ class PGDialect_psycopg2cffi(PGDialect_psycopg2): ) @classmethod - def dbapi(cls): + def import_dbapi(cls): return __import__("psycopg2cffi") @util.memoized_property diff --git a/lib/sqlalchemy/dialects/sqlite/aiosqlite.py b/lib/sqlalchemy/dialects/sqlite/aiosqlite.py index e88ab1a0f..dd0499975 100644 --- a/lib/sqlalchemy/dialects/sqlite/aiosqlite.py +++ b/lib/sqlalchemy/dialects/sqlite/aiosqlite.py @@ -308,7 +308,7 @@ class SQLiteDialect_aiosqlite(SQLiteDialect_pysqlite): execution_ctx_cls = SQLiteExecutionContext_aiosqlite @classmethod - def dbapi(cls): + def import_dbapi(cls): return AsyncAdapt_aiosqlite_dbapi( __import__("aiosqlite"), __import__("sqlite3") ) diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py b/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py index 28f795298..b67eed974 100644 --- a/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py +++ b/lib/sqlalchemy/dialects/sqlite/pysqlcipher.py @@ -105,7 +105,7 @@ class SQLiteDialect_pysqlcipher(SQLiteDialect_pysqlite): pragmas = ("kdf_iter", "cipher", "cipher_page_size", "cipher_use_hmac") @classmethod - def dbapi(cls): + def import_dbapi(cls): try: import sqlcipher3 as sqlcipher except ImportError: diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlite.py b/lib/sqlalchemy/dialects/sqlite/pysqlite.py index 8476e6834..2aa7149a6 100644 --- a/lib/sqlalchemy/dialects/sqlite/pysqlite.py +++ b/lib/sqlalchemy/dialects/sqlite/pysqlite.py @@ -465,7 +465,7 @@ class SQLiteDialect_pysqlite(SQLiteDialect): driver = "pysqlite" @classmethod - def dbapi(cls): + def import_dbapi(cls): from sqlite3 import dbapi2 as sqlite return sqlite |