summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-08-17 12:14:58 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-08-17 12:14:58 -0400
commit2038837fa4c03c6da4b6d4c389fd062abc4e844c (patch)
tree0bec9bdd402e6d2fdc814efb4fb223661dd00302 /lib/sqlalchemy/orm/query.py
parentb83a1564f1f4bc8da2af2d33bfb4f524b620382b (diff)
downloadsqlalchemy-2038837fa4c03c6da4b6d4c389fd062abc4e844c.tar.gz
- spot checking of imports, obsolete functions
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 1c322d5b9..ace4c118e 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2414,10 +2414,10 @@ class Query(object):
"""
return [
{
- 'name':ent._label_name,
- 'type':ent.type,
- 'aliased':getattr(ent, 'is_aliased_class', False),
- 'expr':ent.expr
+ 'name': ent._label_name,
+ 'type': ent.type,
+ 'aliased': getattr(ent, 'is_aliased_class', False),
+ 'expr': ent.expr
}
for ent in self._entities
]
@@ -2937,10 +2937,8 @@ class _MapperEntity(_QueryEntity):
return entity.common_parent(self.entity_zero)
- #_adapted_selectable = None
def adapt_to_selectable(self, query, sel):
query._entities.append(self)
- # self._adapted_selectable = sel
def _get_entity_clauses(self, query, context):