diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-10-26 20:30:41 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-10-26 20:30:41 +0000 |
| commit | 00dfc7d268441d6d6bb1965dd93d1ff5d7d02c9d (patch) | |
| tree | 3640327fe8adab5c77786c3de59514970ad2bc48 /lib/sqlalchemy/engine | |
| parent | ddb9136cf3c8abfe2ba8e05c28707ccb6167b98b (diff) | |
| download | sqlalchemy-00dfc7d268441d6d6bb1965dd93d1ff5d7d02c9d.tar.gz | |
converted imports to absolute
Diffstat (limited to 'lib/sqlalchemy/engine')
| -rw-r--r-- | lib/sqlalchemy/engine/__init__.py | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/threadlocal.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/url.py | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py index e2a8edf69..a53ea4971 100644 --- a/lib/sqlalchemy/engine/__init__.py +++ b/lib/sqlalchemy/engine/__init__.py @@ -4,10 +4,9 @@ # This module is part of SQLAlchemy and is released under # the MIT License: http://www.opensource.org/licenses/mit-license.php -import sqlalchemy.databases - -from base import * -import strategies +from sqlalchemy import databases +from sqlalchemy.engine.base import * +from sqlalchemy.engine import strategies import re def engine_descriptors(): diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index ea542fe5b..02d3e4608 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -6,9 +6,9 @@ from sqlalchemy import schema, exceptions, util, sql, types -import sqlalchemy.pool +from sqlalchemy import pool as poollib import StringIO, sys, re -import base +from sqlalchemy.engine import base """provides default implementations of the engine interfaces""" @@ -22,7 +22,7 @@ class PoolConnectionProvider(base.ConnectionProvider): kwargs.setdefault('echo', False) kwargs.setdefault('use_threadlocal',True) if poolclass is None: - poolclass = sqlalchemy.pool.QueuePool + poolclass = poollib.QueuePool dbapi = dialect.dbapi() if dbapi is None: raise exceptions.InvalidRequestError("Cant get DBAPI module for dialect '%s'" % dialect) @@ -34,7 +34,7 @@ class PoolConnectionProvider(base.ConnectionProvider): creator = kwargs.pop('creator', connect) self._pool = poolclass(creator, **kwargs) else: - if isinstance(pool, sqlalchemy.pool.DBProxy): + if isinstance(pool, poollib.DBProxy): self._pool = pool.get_pool(*cargs, **cparams) else: self._pool = pool diff --git a/lib/sqlalchemy/engine/threadlocal.py b/lib/sqlalchemy/engine/threadlocal.py index a04e8edbe..beac3ee3f 100644 --- a/lib/sqlalchemy/engine/threadlocal.py +++ b/lib/sqlalchemy/engine/threadlocal.py @@ -1,6 +1,6 @@ from sqlalchemy import schema, exceptions, util, sql, types import StringIO, sys, re -import base, default +from sqlalchemy.engine import base, default """provides a thread-local transactional wrapper around the basic ComposedSQLEngine. multiple calls to engine.connect() will return the same connection for the same thread. also provides begin/commit methods on the engine itself diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py index 9b0e9f39e..f492ce425 100644 --- a/lib/sqlalchemy/engine/url.py +++ b/lib/sqlalchemy/engine/url.py @@ -1,7 +1,7 @@ import re import cgi import urllib -import sqlalchemy.exceptions as exceptions +from sqlalchemy import exceptions """provides the URL object as well as the make_url parsing function.""" |
