From: Paul Brown Date: Fri, 17 Mar 2017 05:24:15 +0000 (-0500) Subject: fix pep8 errors in association example X-Git-Tag: rel_1_1_7~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a0ab7c8da9c0f679b965df6000c9656a4732b79;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fix pep8 errors in association example (cherry picked from commit 6aad7fb4217ef294f68f693be5b3137c28184949) --- diff --git a/examples/association/__init__.py b/examples/association/__init__.py index 4cd64c22f8..dc9593a0e8 100644 --- a/examples/association/__init__.py +++ b/examples/association/__init__.py @@ -5,4 +5,4 @@ classes that are associated in a many-to-many pattern. .. autosource:: -""" \ No newline at end of file +""" diff --git a/examples/association/basic_association.py b/examples/association/basic_association.py index 8a8a54ad1c..3835e44f20 100644 --- a/examples/association/basic_association.py +++ b/examples/association/basic_association.py @@ -14,13 +14,14 @@ of "items", with a particular price paid associated with each "item". from datetime import datetime -from sqlalchemy import (create_engine, MetaData, Table, Column, Integer, - String, DateTime, Float, ForeignKey, and_) -from sqlalchemy.orm import mapper, relationship, Session +from sqlalchemy import (create_engine, Column, Integer, String, DateTime, + Float, ForeignKey, and_) +from sqlalchemy.orm import relationship, Session from sqlalchemy.ext.declarative import declarative_base Base = declarative_base() + class Order(Base): __tablename__ = 'order' @@ -28,11 +29,12 @@ class Order(Base): customer_name = Column(String(30), nullable=False) order_date = Column(DateTime, nullable=False, default=datetime.now()) order_items = relationship("OrderItem", cascade="all, delete-orphan", - backref='order') + backref='order') def __init__(self, customer_name): self.customer_name = customer_name + class Item(Base): __tablename__ = 'item' item_id = Column(Integer, primary_key=True) @@ -45,8 +47,9 @@ class Item(Base): def __repr__(self): return 'Item(%r, %r)' % ( - self.description, self.price - ) + self.description, self.price + ) + class OrderItem(Base): __tablename__ = 'orderitem' @@ -59,6 +62,7 @@ class OrderItem(Base): self.price = price or item.price item = relationship(Item, lazy='joined') + if __name__ == '__main__': engine = create_engine('sqlite://') Base.metadata.create_all(engine) diff --git a/examples/association/dict_of_sets_with_default.py b/examples/association/dict_of_sets_with_default.py index fc4aebfca5..4f0ff462da 100644 --- a/examples/association/dict_of_sets_with_default.py +++ b/examples/association/dict_of_sets_with_default.py @@ -21,19 +21,24 @@ from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.associationproxy import association_proxy import operator + class Base(object): id = Column(Integer, primary_key=True) + Base = declarative_base(cls=Base) + class GenDefaultCollection(MappedCollection): def __missing__(self, key): self[key] = b = B(key) return b + class A(Base): __tablename__ = "a" - associations = relationship("B", + associations = relationship( + "B", collection_class=lambda: GenDefaultCollection(operator.attrgetter("key")) ) @@ -42,6 +47,7 @@ class A(Base): association proxy of B. """ + class B(Base): __tablename__ = "b" a_id = Column(Integer, ForeignKey("a.id"), nullable=False) @@ -57,13 +63,16 @@ class B(Base): if values: self.values = values + class C(Base): __tablename__ = "c" b_id = Column(Integer, ForeignKey("b.id"), nullable=False) value = Column(Integer) + def __init__(self, value): self.value = value + if __name__ == '__main__': engine = create_engine('sqlite://', echo=True) Base.metadata.create_all(engine) @@ -88,5 +97,3 @@ if __name__ == '__main__': session.commit() print(a1.collections["2"]) - - diff --git a/examples/association/proxied_association.py b/examples/association/proxied_association.py index 7cb4c93382..d5d48819f6 100644 --- a/examples/association/proxied_association.py +++ b/examples/association/proxied_association.py @@ -9,14 +9,15 @@ to ``OrderItem`` optional. from datetime import datetime -from sqlalchemy import (create_engine, MetaData, Table, Column, Integer, - String, DateTime, Float, ForeignKey, and_) -from sqlalchemy.orm import mapper, relationship, Session +from sqlalchemy import (create_engine, Column, Integer, String, DateTime, + Float, ForeignKey) +from sqlalchemy.orm import relationship, Session from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.associationproxy import association_proxy Base = declarative_base() + class Order(Base): __tablename__ = 'order' @@ -24,12 +25,13 @@ class Order(Base): customer_name = Column(String(30), nullable=False) order_date = Column(DateTime, nullable=False, default=datetime.now()) order_items = relationship("OrderItem", cascade="all, delete-orphan", - backref='order') + backref='order') items = association_proxy("order_items", "item") def __init__(self, customer_name): self.customer_name = customer_name + class Item(Base): __tablename__ = 'item' item_id = Column(Integer, primary_key=True) @@ -41,9 +43,8 @@ class Item(Base): self.price = price def __repr__(self): - return 'Item(%r, %r)' % ( - self.description, self.price - ) + return 'Item(%r, %r)' % (self.description, self.price) + class OrderItem(Base): __tablename__ = 'orderitem' @@ -56,6 +57,7 @@ class OrderItem(Base): self.price = price or item.price item = relationship(Item, lazy='joined') + if __name__ == '__main__': engine = create_engine('sqlite://') Base.metadata.create_all(engine) @@ -99,7 +101,7 @@ if __name__ == '__main__': # print customers who bought 'MySQL Crowbar' on sale orders = session.query(Order).\ - join('order_items', 'item').\ - filter(Item.description == 'MySQL Crowbar').\ - filter(Item.price > OrderItem.price) + join('order_items', 'item').\ + filter(Item.description == 'MySQL Crowbar').\ + filter(Item.price > OrderItem.price) print([o.customer_name for o in orders])