summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/pool
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/pool')
-rw-r--r--lib/sqlalchemy/pool/__init__.py41
-rw-r--r--lib/sqlalchemy/pool/base.py6
-rw-r--r--lib/sqlalchemy/pool/dbapi_proxy.py1
-rw-r--r--lib/sqlalchemy/pool/impl.py5
4 files changed, 38 insertions, 15 deletions
diff --git a/lib/sqlalchemy/pool/__init__.py b/lib/sqlalchemy/pool/__init__.py
index 2aa6eeeb7..39017906c 100644
--- a/lib/sqlalchemy/pool/__init__.py
+++ b/lib/sqlalchemy/pool/__init__.py
@@ -17,19 +17,36 @@ regular DB-API connect() methods to be transparently managed by a
SQLAlchemy connection pool.
"""
+from .base import _ConnectionFairy # noqa
+from .base import _ConnectionRecord # noqa
+from .base import _finalize_fairy # noqa
from .base import _refs # noqa
-from .base import Pool # noqa
-from .impl import ( # noqa
- QueuePool,
- StaticPool,
- NullPool,
- AssertionPool,
- SingletonThreadPool,
-)
-from .dbapi_proxy import manage, clear_managers # noqa
-
-from .base import reset_rollback, reset_commit, reset_none # noqa
+from .base import Pool
+from .base import reset_commit
+from .base import reset_none
+from .base import reset_rollback
+from .dbapi_proxy import clear_managers
+from .dbapi_proxy import manage
+from .impl import AssertionPool
+from .impl import NullPool
+from .impl import QueuePool
+from .impl import SingletonThreadPool
+from .impl import StaticPool
+
+
+__all__ = [
+ "Pool",
+ "reset_commit",
+ "reset_none",
+ "reset_rollback",
+ "clear_managers",
+ "manage",
+ "AssertionPool",
+ "NullPool",
+ "QueuePool",
+ "SingletonThreadPool",
+ "StaticPool",
+]
# as these are likely to be used in various test suites, debugging
# setups, keep them in the sqlalchemy.pool namespace
-from .base import _ConnectionFairy, _ConnectionRecord, _finalize_fairy # noqa
diff --git a/lib/sqlalchemy/pool/base.py b/lib/sqlalchemy/pool/base.py
index 382e740c6..8df0b89c6 100644
--- a/lib/sqlalchemy/pool/base.py
+++ b/lib/sqlalchemy/pool/base.py
@@ -14,7 +14,11 @@ from collections import deque
import time
import weakref
-from .. import exc, log, event, interfaces, util
+from .. import event
+from .. import exc
+from .. import interfaces
+from .. import log
+from .. import util
from ..util import threading
diff --git a/lib/sqlalchemy/pool/dbapi_proxy.py b/lib/sqlalchemy/pool/dbapi_proxy.py
index 425c4a114..ccd157948 100644
--- a/lib/sqlalchemy/pool/dbapi_proxy.py
+++ b/lib/sqlalchemy/pool/dbapi_proxy.py
@@ -18,6 +18,7 @@ today.
from .impl import QueuePool
from ..util import threading
+
proxies = {}
diff --git a/lib/sqlalchemy/pool/impl.py b/lib/sqlalchemy/pool/impl.py
index 6159f6a5b..d1b038d47 100644
--- a/lib/sqlalchemy/pool/impl.py
+++ b/lib/sqlalchemy/pool/impl.py
@@ -13,11 +13,12 @@
import traceback
import weakref
-from .base import Pool, _ConnectionRecord
+from .base import _ConnectionRecord
+from .base import Pool
from .. import exc
from .. import util
-from ..util import queue as sqla_queue
from ..util import chop_traceback
+from ..util import queue as sqla_queue
from ..util import threading