diff options
Diffstat (limited to 'test/orm/test_rel_fn.py')
| -rw-r--r-- | test/orm/test_rel_fn.py | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/test/orm/test_rel_fn.py b/test/orm/test_rel_fn.py index eb9460580..f937802c3 100644 --- a/test/orm/test_rel_fn.py +++ b/test/orm/test_rel_fn.py @@ -297,7 +297,7 @@ class _JoinFixtures: self.selfref, self.selfref, prop=self.relationship, - remote_side=set([self.selfref.c.id]), + remote_side={self.selfref.c.id}, **kw, ) @@ -318,12 +318,10 @@ class _JoinFixtures: self.composite_selfref, self.composite_selfref, prop=self.relationship, - remote_side=set( - [ - self.composite_selfref.c.id, - self.composite_selfref.c.group_id, - ] - ), + remote_side={ + self.composite_selfref.c.id, + self.composite_selfref.c.group_id, + }, **kw, ) @@ -356,7 +354,7 @@ class _JoinFixtures: self.composite_selfref.c.parent_id == self.composite_selfref.c.id, ), - remote_side=set([self.composite_selfref.c.parent_id]), + remote_side={self.composite_selfref.c.parent_id}, **kw, ) @@ -800,7 +798,7 @@ class ColumnCollectionsTest( def test_determine_remote_columns_compound_1(self): joincond = self._join_fixture_compound_expression_1(support_sync=False) - eq_(joincond.remote_columns, set([self.right.c.x, self.right.c.y])) + eq_(joincond.remote_columns, {self.right.c.x, self.right.c.y}) def test_determine_local_remote_compound_1(self): joincond = self._join_fixture_compound_expression_1(support_sync=False) @@ -848,15 +846,15 @@ class ColumnCollectionsTest( def test_determine_remote_columns_compound_2(self): joincond = self._join_fixture_compound_expression_2(support_sync=False) - eq_(joincond.remote_columns, set([self.right.c.x, self.right.c.y])) + eq_(joincond.remote_columns, {self.right.c.x, self.right.c.y}) def test_determine_remote_columns_o2m(self): joincond = self._join_fixture_o2m() - eq_(joincond.remote_columns, set([self.right.c.lid])) + eq_(joincond.remote_columns, {self.right.c.lid}) def test_determine_remote_columns_o2m_selfref(self): joincond = self._join_fixture_o2m_selfref() - eq_(joincond.remote_columns, set([self.selfref.c.sid])) + eq_(joincond.remote_columns, {self.selfref.c.sid}) def test_determine_local_remote_pairs_o2m_composite_selfref(self): joincond = self._join_fixture_o2m_composite_selfref() @@ -915,17 +913,15 @@ class ColumnCollectionsTest( joincond = self._join_fixture_m2o_composite_selfref() eq_( joincond.remote_columns, - set( - [ - self.composite_selfref.c.id, - self.composite_selfref.c.group_id, - ] - ), + { + self.composite_selfref.c.id, + self.composite_selfref.c.group_id, + }, ) def test_determine_remote_columns_m2o(self): joincond = self._join_fixture_m2o() - eq_(joincond.remote_columns, set([self.left.c.id])) + eq_(joincond.remote_columns, {self.left.c.id}) def test_determine_local_remote_pairs_o2m(self): joincond = self._join_fixture_o2m() @@ -978,23 +974,23 @@ class ColumnCollectionsTest( def test_determine_local_columns_m2m_backref(self): j1, j2 = self._join_fixture_m2m_backref() - eq_(j1.local_columns, set([self.m2mleft.c.id])) - eq_(j2.local_columns, set([self.m2mright.c.id])) + eq_(j1.local_columns, {self.m2mleft.c.id}) + eq_(j2.local_columns, {self.m2mright.c.id}) def test_determine_remote_columns_m2m_backref(self): j1, j2 = self._join_fixture_m2m_backref() eq_( j1.remote_columns, - set([self.m2msecondary.c.lid, self.m2msecondary.c.rid]), + {self.m2msecondary.c.lid, self.m2msecondary.c.rid}, ) eq_( j2.remote_columns, - set([self.m2msecondary.c.lid, self.m2msecondary.c.rid]), + {self.m2msecondary.c.lid, self.m2msecondary.c.rid}, ) def test_determine_remote_columns_m2o_selfref(self): joincond = self._join_fixture_m2o_selfref() - eq_(joincond.remote_columns, set([self.selfref.c.id])) + eq_(joincond.remote_columns, {self.selfref.c.id}) def test_determine_local_remote_cols_three_tab_viewonly(self): joincond = self._join_fixture_overlapping_three_tables() @@ -1004,7 +1000,7 @@ class ColumnCollectionsTest( ) eq_( joincond.remote_columns, - set([self.three_tab_b.c.id, self.three_tab_b.c.aid]), + {self.three_tab_b.c.id, self.three_tab_b.c.aid}, ) def test_determine_local_remote_overlapping_composite_fks(self): @@ -1033,7 +1029,7 @@ class ColumnCollectionsTest( ) eq_( joincond.remote_columns, - set([self.base.c.flag, self.sub_w_sub_rel.c.sub_id]), + {self.base.c.flag, self.sub_w_sub_rel.c.sub_id}, ) |