From: Paul Brown Date: Fri, 17 Mar 2017 05:23:49 +0000 (-0500) Subject: fix pep8 errors in adjacency_list example X-Git-Tag: rel_1_2_0b1~144 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dad0f93e8a7f1dcd79ff5c3640c997667d06248;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fix pep8 errors in adjacency_list example (cherry picked from commit ff230f1862892eb2b479ed85e6858a82159b435f) --- diff --git a/examples/adjacency_list/__init__.py b/examples/adjacency_list/__init__.py index 5d80363e4a..65ce311e6d 100644 --- a/examples/adjacency_list/__init__.py +++ b/examples/adjacency_list/__init__.py @@ -15,4 +15,3 @@ E.g.:: .. autosource:: """ - diff --git a/examples/adjacency_list/adjacency_list.py b/examples/adjacency_list/adjacency_list.py index 9e62bc0be2..3c91443235 100644 --- a/examples/adjacency_list/adjacency_list.py +++ b/examples/adjacency_list/adjacency_list.py @@ -1,32 +1,32 @@ from sqlalchemy import Column, ForeignKey, Integer, String, create_engine -from sqlalchemy.orm import Session, relationship, backref,\ - joinedload_all +from sqlalchemy.orm import Session, relationship, backref, joinedload_all from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm.collections import attribute_mapped_collection Base = declarative_base() + class TreeNode(Base): __tablename__ = 'tree' id = Column(Integer, primary_key=True) parent_id = Column(Integer, ForeignKey(id)) name = Column(String(50), nullable=False) - children = relationship("TreeNode", - - # cascade deletions - cascade="all, delete-orphan", + children = relationship( + "TreeNode", + # cascade deletions + cascade="all, delete-orphan", - # many to one + adjacency list - remote_side - # is required to reference the 'remote' - # column in the join condition. - backref=backref("parent", remote_side=id), + # many to one + adjacency list - remote_side + # is required to reference the 'remote' + # column in the join condition. + backref=backref("parent", remote_side=id), - # children will be represented as a dictionary - # on the "name" attribute. - collection_class=attribute_mapped_collection('name'), - ) + # children will be represented as a dictionary + # on the "name" attribute. + collection_class=attribute_mapped_collection('name'), + ) def __init__(self, name, parent=None): self.name = name @@ -34,18 +34,19 @@ class TreeNode(Base): def __repr__(self): return "TreeNode(name=%r, id=%r, parent_id=%r)" % ( - self.name, - self.id, - self.parent_id - ) + self.name, + self.id, + self.parent_id + ) def dump(self, _indent=0): return " " * _indent + repr(self) + \ - "\n" + \ - "".join([ - c.dump(_indent + 1) - for c in self.children.values()] - ) + "\n" + \ + "".join([ + c.dump(_indent + 1) + for c in self.children.values() + ]) + if __name__ == '__main__': engine = create_engine('sqlite://', echo=True) @@ -94,14 +95,14 @@ if __name__ == '__main__': msg("Tree after save:\n %s", node.dump()) - msg("Emptying out the session entirely, " - "selecting tree on root, using eager loading to join four levels deep.") + msg("Emptying out the session entirely, selecting tree on root, using " + "eager loading to join four levels deep.") session.expunge_all() node = session.query(TreeNode).\ - options(joinedload_all("children", "children", - "children", "children")).\ - filter(TreeNode.name == "rootnode").\ - first() + options(joinedload_all("children", "children", + "children", "children")).\ + filter(TreeNode.name == "rootnode").\ + first() msg("Full Tree:\n%s", node.dump())