summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/context.py
diff options
context:
space:
mode:
authorFederico Caselli <cfederico87@gmail.com>2022-11-03 20:52:21 +0100
committerFederico Caselli <cfederico87@gmail.com>2022-11-16 23:03:04 +0100
commit4eb4ceca36c7ce931ea65ac06d6ed08bf459fc66 (patch)
tree4970cff3f78489a4a0066cd27fd4bae682402957 /lib/sqlalchemy/orm/context.py
parent3fc6c40ea77c971d3067dab0fdf57a5b5313b69b (diff)
downloadsqlalchemy-4eb4ceca36c7ce931ea65ac06d6ed08bf459fc66.tar.gz
Try running pyupgrade on the code
command run is "pyupgrade --py37-plus --keep-runtime-typing --keep-percent-format <files...>" pyupgrade will change assert_ to assertTrue. That was reverted since assertTrue does not exists in sqlalchemy fixtures Change-Id: Ie1ed2675c7b11d893d78e028aad0d1576baebb55
Diffstat (limited to 'lib/sqlalchemy/orm/context.py')
-rw-r--r--lib/sqlalchemy/orm/context.py17
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/sqlalchemy/orm/context.py b/lib/sqlalchemy/orm/context.py
index 60ccecdb7..621b3e5d7 100644
--- a/lib/sqlalchemy/orm/context.py
+++ b/lib/sqlalchemy/orm/context.py
@@ -838,12 +838,10 @@ class FromStatement(GroupedElement, Generative, TypedReturnsRows[_TP]):
return self
def get_children(self, **kw):
- for elem in itertools.chain.from_iterable(
+ yield from itertools.chain.from_iterable(
element._from_objects for element in self._raw_columns
- ):
- yield elem
- for elem in super(FromStatement, self).get_children(**kw):
- yield elem
+ )
+ yield from super().get_children(**kw)
@property
def _all_selected_columns(self):
@@ -1245,14 +1243,11 @@ class ORMSelectCompileState(ORMCompileState, SelectState):
):
ens = element._annotations["entity_namespace"]
if not ens.is_mapper and not ens.is_aliased_class:
- for elem in _select_iterables([element]):
- yield elem
+ yield from _select_iterables([element])
else:
- for elem in _select_iterables(ens._all_column_expressions):
- yield elem
+ yield from _select_iterables(ens._all_column_expressions)
else:
- for elem in _select_iterables([element]):
- yield elem
+ yield from _select_iterables([element])
@classmethod
def get_columns_clause_froms(cls, statement):