From: Mike Bayer Date: Tue, 23 Sep 2014 02:22:09 +0000 (-0400) Subject: pep8/flake8 X-Git-Tag: rel_1_0_0b1~70^2~69 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dacbb25f86f828ab5df6b6424f4eb7f402a356e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git pep8/flake8 --- diff --git a/test/ext/test_automap.py b/test/ext/test_automap.py index f24164cb7c..6cfd0fbcac 100644 --- a/test/ext/test_automap.py +++ b/test/ext/test_automap.py @@ -1,13 +1,14 @@ -from sqlalchemy.testing import fixtures, eq_ +from sqlalchemy.testing import fixtures from ..orm._fixtures import FixtureTest from sqlalchemy.ext.automap import automap_base -from sqlalchemy.orm import relationship, interfaces, backref +from sqlalchemy.orm import relationship, interfaces from sqlalchemy.ext.automap import generate_relationship -from sqlalchemy.testing.mock import Mock, call +from sqlalchemy.testing.mock import Mock from sqlalchemy import String, Integer, ForeignKey from sqlalchemy import testing from sqlalchemy.testing.schema import Table, Column + class AutomapTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): @@ -27,6 +28,7 @@ class AutomapTest(fixtures.MappedTest): def test_relationship_explicit_override_o2m(self): Base = automap_base(metadata=self.metadata) prop = relationship("addresses", collection_class=set) + class User(Base): __tablename__ = 'users' @@ -44,6 +46,7 @@ class AutomapTest(fixtures.MappedTest): Base = automap_base(metadata=self.metadata) prop = relationship("users") + class Address(Base): __tablename__ = 'addresses' @@ -57,7 +60,6 @@ class AutomapTest(fixtures.MappedTest): u1 = User(name='u1', address_collection=[a1]) assert a1.users is u1 - def test_relationship_self_referential(self): Base = automap_base(metadata=self.metadata) Base.prepare() @@ -75,17 +77,19 @@ class AutomapTest(fixtures.MappedTest): def classname_for_table(base, tablename, table): return str("cls_" + tablename) - def name_for_scalar_relationship(base, local_cls, referred_cls, constraint): + def name_for_scalar_relationship( + base, local_cls, referred_cls, constraint): return "scalar_" + referred_cls.__name__ - def name_for_collection_relationship(base, local_cls, referred_cls, constraint): + def name_for_collection_relationship( + base, local_cls, referred_cls, constraint): return "coll_" + referred_cls.__name__ Base.prepare( - classname_for_table=classname_for_table, - name_for_scalar_relationship=name_for_scalar_relationship, - name_for_collection_relationship=name_for_collection_relationship - ) + classname_for_table=classname_for_table, + name_for_scalar_relationship=name_for_scalar_relationship, + name_for_collection_relationship=name_for_collection_relationship + ) User = Base.classes.cls_users Address = Base.classes.cls_addresses @@ -113,9 +117,10 @@ class AutomapTest(fixtures.MappedTest): class Order(Base): __tablename__ = 'orders' - items_collection = relationship("items", - secondary="order_items", - collection_class=set) + items_collection = relationship( + "items", + secondary="order_items", + collection_class=set) Base.prepare() Item = Base.classes['items'] @@ -133,41 +138,49 @@ class AutomapTest(fixtures.MappedTest): Base = automap_base(metadata=self.metadata) mock = Mock() - def _gen_relationship(base, direction, return_fn, attrname, - local_cls, referred_cls, **kw): + + def _gen_relationship( + base, direction, return_fn, attrname, + local_cls, referred_cls, **kw): mock(base, direction, attrname) - return generate_relationship(base, direction, return_fn, - attrname, local_cls, referred_cls, **kw) + return generate_relationship( + base, direction, return_fn, + attrname, local_cls, referred_cls, **kw) Base.prepare(generate_relationship=_gen_relationship) assert set(tuple(c[1]) for c in mock.mock_calls).issuperset([ - (Base, interfaces.MANYTOONE, "nodes"), - (Base, interfaces.MANYTOMANY, "keywords_collection"), - (Base, interfaces.MANYTOMANY, "items_collection"), - (Base, interfaces.MANYTOONE, "users"), - (Base, interfaces.ONETOMANY, "addresses_collection"), + (Base, interfaces.MANYTOONE, "nodes"), + (Base, interfaces.MANYTOMANY, "keywords_collection"), + (Base, interfaces.MANYTOMANY, "items_collection"), + (Base, interfaces.MANYTOONE, "users"), + (Base, interfaces.ONETOMANY, "addresses_collection"), ]) class AutomapInhTest(fixtures.MappedTest): @classmethod def define_tables(cls, metadata): - Table('single', metadata, - Column('id', Integer, primary_key=True), - Column('type', String(10)), - test_needs_fk=True - ) - - Table('joined_base', metadata, - Column('id', Integer, primary_key=True), - Column('type', String(10)), - test_needs_fk=True - ) - - Table('joined_inh', metadata, - Column('id', Integer, ForeignKey('joined_base.id'), primary_key=True), - test_needs_fk=True - ) + Table( + 'single', metadata, + Column('id', Integer, primary_key=True), + Column('type', String(10)), + test_needs_fk=True + ) + + Table( + 'joined_base', metadata, + Column('id', Integer, primary_key=True), + Column('type', String(10)), + test_needs_fk=True + ) + + Table( + 'joined_inh', metadata, + Column( + 'id', Integer, + ForeignKey('joined_base.id'), primary_key=True), + test_needs_fk=True + ) FixtureTest.define_tables(metadata) @@ -179,7 +192,8 @@ class AutomapInhTest(fixtures.MappedTest): type = Column(String) - __mapper_args__ = {"polymorphic_identity": "u0", + __mapper_args__ = { + "polymorphic_identity": "u0", "polymorphic_on": type} class SubUser1(Single): @@ -200,14 +214,14 @@ class AutomapInhTest(fixtures.MappedTest): type = Column(String) - __mapper_args__ = {"polymorphic_identity": "u0", + __mapper_args__ = { + "polymorphic_identity": "u0", "polymorphic_on": type} class SubJoined(Joined): __tablename__ = 'joined_inh' __mapper_args__ = {"polymorphic_identity": "u1"} - Base.prepare(engine=testing.db, reflect=True) assert SubJoined.__mapper__.inherits is Joined.__mapper__ @@ -217,6 +231,9 @@ class AutomapInhTest(fixtures.MappedTest): def test_conditional_relationship(self): Base = automap_base() + def _gen_relationship(*arg, **kw): return None - Base.prepare(engine=testing.db, reflect=True, generate_relationship=_gen_relationship) + Base.prepare( + engine=testing.db, reflect=True, + generate_relationship=_gen_relationship)