diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-08-04 15:28:40 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-08-04 15:28:40 -0400 |
| commit | 1a88a982b43f2f3a0735890b00a45e178727812f (patch) | |
| tree | a5a49a6bc15261cc3d44a879cbe857f408517c3f /lib/sqlalchemy/orm/loading.py | |
| parent | 9a49e09d0bae23bde869842c1444b65dc7e58c3d (diff) | |
| download | sqlalchemy-1a88a982b43f2f3a0735890b00a45e178727812f.tar.gz | |
find some more inline imports and move them out
Diffstat (limited to 'lib/sqlalchemy/orm/loading.py')
| -rw-r--r-- | lib/sqlalchemy/orm/loading.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py index 1641f509e..c219ea096 100644 --- a/lib/sqlalchemy/orm/loading.py +++ b/lib/sqlalchemy/orm/loading.py @@ -19,6 +19,8 @@ from .interfaces import EXT_CONTINUE from ..sql import util as sql_util from .util import _none_set, state_str from .. import exc as sa_exc + +querylib = util.importlater("sqlalchemy.orm", "query") sessionlib = util.importlater("sqlalchemy.orm", "session") _new_runid = util.counter() @@ -101,8 +103,6 @@ def instances(query, cursor, context): def merge_result(query, iterator, load=True): """Merge a result into this :class:`.Query` object's Session.""" - from . import query as querylib - session = query.session if load: # flush current contents if we expect to load data |