- absolute imports in connectors, databases

diff --git a/lib/sqlalchemy/connectors/mxodbc.py b/lib/sqlalchemy/connectors/mxodbc.py
index e46253b49abb08c697eb20904091954dc0076f65..f3ce924d164b12260cbc152b45bc1416071dd181 100644 (file)
--- 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 b5a9f05a8d2b8bd48a9202eccbcbf0120f07fc7b..3e192e7806c2b28cbd6651ae18714af56179ebda 100644 (file)
--- 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 a684a2dcb6433ca822b9d059cd361096606cdf90..f190329f74d82fab28bc70b7c67ce146315ae642 100644 (file)
--- 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 5bc25f4aa85c9ad83fc6f340a09d76488b5a7993..46ab7efa550b70c1e1ad6864e8b89d4f1e63dfcf 100644 (file)
--- 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 fe63883730de9750e12d9bcb01d864d5ab08a342..3dae7df17c19e0fb8b908940760b7d6f8c4dd1dd 100644 (file)
--- 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 16eb32e21a35971a738870a73cf7a57318736a88..4d5aebf62c8b1fc6ca56392afb5748849dcae330 100644 (file)
--- 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.