From: Mike Bayer Date: Sat, 28 Jan 2006 18:05:45 +0000 (+0000) Subject: took out print statement X-Git-Tag: rel_0_1_0~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1c9c54af889952553817f605f31965affaa5923;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git took out print statement --- diff --git a/lib/sqlalchemy/mapping/topological.py b/lib/sqlalchemy/mapping/topological.py index 8c51b8f67b..625fc76593 100644 --- a/lib/sqlalchemy/mapping/topological.py +++ b/lib/sqlalchemy/mapping/topological.py @@ -95,9 +95,7 @@ class QueueDependencySorter(object): raise "Self-referential dependency detected " + repr(t) childnode = nodes[t[1]] parentnode = nodes[t[0]] - edges[parentnode][childnode] = True - parentnode.dependencies[childnode] = True - childnode.edges[parentnode] = True + self._add_edge(edges, (parentnode, childnode)) queue = [] for n in nodes.values(): @@ -107,7 +105,7 @@ class QueueDependencySorter(object): cycles = {} output = [] while len(edges) > 0: - print self._dump_edges(edges) + #print self._dump_edges(edges) if len(queue) == 0: # edges remain but no edgeless nodes to remove; this indicates # a cycle @@ -154,6 +152,12 @@ class QueueDependencySorter(object): node.children.append(o) return head + def _add_edge(self, edges, edge): + (parentnode, childnode) = edge + edges[parentnode][childnode] = True + parentnode.dependencies[childnode] = True + childnode.edges[parentnode] = True + def _remove_edge(self, edges, edge): (parentnode, childnode) = edge del edges[parentnode][childnode]