summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-08-04 15:28:40 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-08-04 15:28:40 -0400
commit1a88a982b43f2f3a0735890b00a45e178727812f (patch)
treea5a49a6bc15261cc3d44a879cbe857f408517c3f /lib/sqlalchemy/orm/query.py
parent9a49e09d0bae23bde869842c1444b65dc7e58c3d (diff)
downloadsqlalchemy-1a88a982b43f2f3a0735890b00a45e178727812f.tar.gz
find some more inline imports and move them out
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index f6fd07e61..5ed63916a 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -36,6 +36,7 @@ from ..sql import (
util as sql_util,
expression, visitors
)
+properties = util.importlater("sqlalchemy.orm", "properties")
__all__ = ['Query', 'QueryContext', 'aliased']
@@ -903,7 +904,6 @@ class Query(object):
"""
if property is None:
- from sqlalchemy.orm import properties
mapper = object_mapper(instance)
for prop in mapper.iterate_properties: