From f0f135b6bd20f7ddcce05711d0185c9c03bf2f41 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 22 Sep 2011 11:55:15 -0400 Subject: [PATCH] remove inline imports from core events too --- lib/sqlalchemy/events.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/sqlalchemy/events.py b/lib/sqlalchemy/events.py index 50637705db..f7de851cc5 100644 --- a/lib/sqlalchemy/events.py +++ b/lib/sqlalchemy/events.py @@ -6,7 +6,10 @@ """Core event interfaces.""" -from sqlalchemy import event, exc +from sqlalchemy import event, exc, util +engine = util.importlater('sqlalchemy', 'engine') +pool = util.importlater('sqlalchemy', 'pool') + class DDLEvents(event.Events): """ @@ -258,15 +261,12 @@ class PoolEvents(event.Events): @classmethod def _accept_with(cls, target): - from sqlalchemy.engine import Engine - from sqlalchemy.pool import Pool - if isinstance(target, type): - if issubclass(target, Engine): - return Pool - elif issubclass(target, Pool): + if issubclass(target, engine.Engine): + return pool.Pool + elif issubclass(target, pool.Pool): return target - elif isinstance(target, Engine): + elif isinstance(target, engine.Engine): return target.pool else: return target -- 2.47.3