diff options
Diffstat (limited to 'test/orm/test_mapper.py')
| -rw-r--r-- | test/orm/test_mapper.py | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py index fa1f1fdf8..15ab260fb 100644 --- a/test/orm/test_mapper.py +++ b/test/orm/test_mapper.py @@ -247,7 +247,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): assert m.configured is False assert sa.orm.mapperlib.Mapper._new_mappers is True - u = User() + User() assert User.addresses assert sa.orm.mapperlib.Mapper._new_mappers is False @@ -533,7 +533,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): assert not m.configured configure_mappers() - m2 = mapper( + mapper( Address, addresses, properties={"user": relationship(User, backref="addresses")}, @@ -662,7 +662,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): m1 = mapper(User, users) User() - m2 = mapper( + mapper( Address, addresses, properties={"user": relationship(User, backref="addresses")}, @@ -731,7 +731,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): inherits=User, properties={"address_id": addresses.c.id}, ) - m3 = mapper(Address, addresses, properties={"foo": relationship(m2)}) + mapper(Address, addresses, properties={"foo": relationship(m2)}) # add property using annotated User.name, # needs to be deannotated m.add_property("x", column_property(User.name + "name")) @@ -858,7 +858,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): class MyUser(User): pass - m1 = mapper( + mapper( User, users, polymorphic_on=users.c.name, @@ -1671,10 +1671,8 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): super(MyFakeProperty, self).post_instrument_class(mapper) configure_mappers() - m1 = mapper( - User, users, properties={"name": MyFakeProperty(users.c.name)} - ) - m2 = mapper(Address, addresses) + mapper(User, users, properties={"name": MyFakeProperty(users.c.name)}) + mapper(Address, addresses) configure_mappers() sa.orm.clear_mappers() @@ -1684,10 +1682,8 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL): super(MyFakeProperty, self).post_instrument_class(mapper) configure_mappers() - m1 = mapper( - User, users, properties={"name": MyFakeProperty(users.c.name)} - ) - m2 = mapper(Address, addresses) + mapper(User, users, properties={"name": MyFakeProperty(users.c.name)}) + mapper(Address, addresses) configure_mappers() def test_reconstructor(self): @@ -3047,9 +3043,9 @@ class DeferredPopulationTest(fixtures.MappedTest): Thing, Human = self.classes.Thing, self.classes.Human session = create_session() - human = ( + human = ( # noqa session.query(Human).options(sa.orm.joinedload("thing")).first() - ) # noqa + ) session.expunge_all() thing = session.query(Thing).options(sa.orm.undefer("name")).first() self._test(thing) @@ -3058,9 +3054,9 @@ class DeferredPopulationTest(fixtures.MappedTest): Thing, Human = self.classes.Thing, self.classes.Human session = create_session() - human = ( + human = ( # noqa session.query(Human).options(sa.orm.joinedload("thing")).first() - ) # noqa + ) thing = session.query(Thing).options(sa.orm.undefer("name")).first() self._test(thing) @@ -3068,9 +3064,9 @@ class DeferredPopulationTest(fixtures.MappedTest): Thing, Human = self.classes.Thing, self.classes.Human session = create_session() - result = ( + result = ( # noqa session.query(Human).add_entity(Thing).join("thing").first() - ) # noqa + ) session.expunge_all() thing = session.query(Thing).options(sa.orm.undefer("name")).first() self._test(thing) @@ -3079,9 +3075,9 @@ class DeferredPopulationTest(fixtures.MappedTest): Thing, Human = self.classes.Thing, self.classes.Human session = create_session() - result = ( + result = ( # noqa session.query(Human).add_entity(Thing).join("thing").first() - ) # noqa + ) thing = session.query(Thing).options(sa.orm.undefer("name")).first() self._test(thing) @@ -3354,7 +3350,7 @@ class RaiseLoadTest(_fixtures.FixtureTest): ) mapper(User, users) s = Session() - u1 = s.query(User).first() + u1 = s.query(User).first() # noqa a1 = ( s.query(Address) .filter_by(id=1) |