diff options
-rw-r--r-- | lib/sqlalchemy/connectors/mxodbc.py | 2 | ||||
-rw-r--r-- | lib/sqlalchemy/connectors/mysqldb.py | 9 | ||||
-rw-r--r-- | lib/sqlalchemy/connectors/pyodbc.py | 4 | ||||
-rw-r--r-- | lib/sqlalchemy/connectors/zxJDBC.py | 2 | ||||
-rw-r--r-- | lib/sqlalchemy/databases/__init__.py | 22 | ||||
-rw-r--r-- | lib/sqlalchemy/dialects/__init__.py | 2 |
6 files changed, 20 insertions, 21 deletions
diff --git a/lib/sqlalchemy/connectors/mxodbc.py b/lib/sqlalchemy/connectors/mxodbc.py index e46253b49..f3ce924d1 100644 --- a/lib/sqlalchemy/connectors/mxodbc.py +++ b/lib/sqlalchemy/connectors/mxodbc.py @@ -22,7 +22,7 @@ import sys import re import warnings -from sqlalchemy.connectors import Connector +from . import Connector class MxODBCConnector(Connector): driver='mxodbc' diff --git a/lib/sqlalchemy/connectors/mysqldb.py b/lib/sqlalchemy/connectors/mysqldb.py index b5a9f05a8..3e192e780 100644 --- a/lib/sqlalchemy/connectors/mysqldb.py +++ b/lib/sqlalchemy/connectors/mysqldb.py @@ -4,11 +4,10 @@ Currently includes MySQL and Drizzle. """ -from sqlalchemy.connectors import Connector -from sqlalchemy.engine import base as engine_base, default -from sqlalchemy.sql import operators as sql_operators -from sqlalchemy import exc, log, schema, sql, types as sqltypes, util -from sqlalchemy import processors +from . import Connector +from ..engine import base as engine_base, default +from ..sql import operators as sql_operators +from .. import exc, log, schema, sql, types as sqltypes, util, processors import re # the subclassing of Connector by all classes diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py index a684a2dcb..f190329f7 100644 --- a/lib/sqlalchemy/connectors/pyodbc.py +++ b/lib/sqlalchemy/connectors/pyodbc.py @@ -4,8 +4,8 @@ # This module is part of SQLAlchemy and is released under # the MIT License: http://www.opensource.org/licenses/mit-license.php -from sqlalchemy.connectors import Connector -from sqlalchemy.util import asbool +from . import Connector +from ..util import asbool import sys import re diff --git a/lib/sqlalchemy/connectors/zxJDBC.py b/lib/sqlalchemy/connectors/zxJDBC.py index 5bc25f4aa..46ab7efa5 100644 --- a/lib/sqlalchemy/connectors/zxJDBC.py +++ b/lib/sqlalchemy/connectors/zxJDBC.py @@ -5,7 +5,7 @@ # the MIT License: http://www.opensource.org/licenses/mit-license.php import sys -from sqlalchemy.connectors import Connector +from . import Connector class ZxJDBCConnector(Connector): driver = 'zxjdbc' diff --git a/lib/sqlalchemy/databases/__init__.py b/lib/sqlalchemy/databases/__init__.py index fe6388373..3dae7df17 100644 --- a/lib/sqlalchemy/databases/__init__.py +++ b/lib/sqlalchemy/databases/__init__.py @@ -8,18 +8,18 @@ compatibility with pre 0.6 versions. """ -from sqlalchemy.dialects.sqlite import base as sqlite -from sqlalchemy.dialects.postgresql import base as postgresql +from ..dialects.sqlite import base as sqlite +from ..dialects.postgresql import base as postgresql postgres = postgresql -from sqlalchemy.dialects.mysql import base as mysql -from sqlalchemy.dialects.drizzle import base as drizzle -from sqlalchemy.dialects.oracle import base as oracle -from sqlalchemy.dialects.firebird import base as firebird -from sqlalchemy.dialects.maxdb import base as maxdb -from sqlalchemy.dialects.informix import base as informix -from sqlalchemy.dialects.mssql import base as mssql -from sqlalchemy.dialects.access import base as access -from sqlalchemy.dialects.sybase import base as sybase +from ..dialects.mysql import base as mysql +from ..dialects.drizzle import base as drizzle +from ..dialects.oracle import base as oracle +from ..dialects.firebird import base as firebird +from ..dialects.maxdb import base as maxdb +from ..dialects.informix import base as informix +from ..dialects.mssql import base as mssql +from ..dialects.access import base as access +from ..dialects.sybase import base as sybase __all__ = ( diff --git a/lib/sqlalchemy/dialects/__init__.py b/lib/sqlalchemy/dialects/__init__.py index 16eb32e21..4d5aebf62 100644 --- a/lib/sqlalchemy/dialects/__init__.py +++ b/lib/sqlalchemy/dialects/__init__.py @@ -18,7 +18,7 @@ __all__ = ( 'sybase', ) -from sqlalchemy import util +from . import util def _auto_fn(name): """default dialect importer. |