diff options
Diffstat (limited to 'lib/sqlalchemy/topological.py')
| -rw-r--r-- | lib/sqlalchemy/topological.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/sqlalchemy/topological.py b/lib/sqlalchemy/topological.py index c4c610b35..bfcfc9c0a 100644 --- a/lib/sqlalchemy/topological.py +++ b/lib/sqlalchemy/topological.py @@ -64,7 +64,7 @@ class _Node(object): def __init__(self, item): self.item = item - self.dependencies = util.Set() + self.dependencies = set() self.children = [] self.cycles = None @@ -84,7 +84,7 @@ class _Node(object): def all_deps(self): """Return a set of dependencies for this node and all its cycles.""" - deps = util.Set(self.dependencies) + deps = set(self.dependencies) if self.cycles is not None: for c in self.cycles: deps.update(c.dependencies) @@ -102,10 +102,10 @@ class _EdgeCollection(object): (parentnode, childnode) = edge if parentnode not in self.parent_to_children: - self.parent_to_children[parentnode] = util.Set() + self.parent_to_children[parentnode] = set() self.parent_to_children[parentnode].add(childnode) if childnode not in self.child_to_parents: - self.child_to_parents[childnode] = util.Set() + self.child_to_parents[childnode] = set() self.child_to_parents[childnode].add(parentnode) parentnode.dependencies.add(childnode) @@ -176,7 +176,7 @@ def _sort(tuples, allitems, allow_cycles=False, ignore_self_cycles=False): if t[0] is t[1]: if allow_cycles: n = nodes[t[0]] - n.cycles = util.Set([n]) + n.cycles = set([n]) elif not ignore_self_cycles: raise CircularDependencyError("Self-referential dependency detected " + repr(t)) continue @@ -197,7 +197,7 @@ def _sort(tuples, allitems, allow_cycles=False, ignore_self_cycles=False): if allow_cycles: for cycle in _find_cycles(edges): lead = cycle[0][0] - lead.cycles = util.Set() + lead.cycles = set() for edge in cycle: n = edges.remove(edge) lead.cycles.add(edge[0]) @@ -239,11 +239,11 @@ def _organize_as_tree(nodes): # in reverse topological order for node in util.reversed(nodes): # nodes subtree and cycles contain the node itself - subtree = util.Set([node]) + subtree = set([node]) if node.cycles is not None: - cycles = util.Set(node.cycles) + cycles = set(node.cycles) else: - cycles = util.Set() + cycles = set() # get a set of dependent nodes of node and its cycles nodealldeps = node.all_deps() if nodealldeps: @@ -270,7 +270,7 @@ def _organize_as_tree(nodes): return (head.item, [n.item for n in head.cycles or []], head.children) def _find_cycles(edges): - involved_in_cycles = util.Set() + involved_in_cycles = set() cycles = {} def traverse(node, goal=None, cycle=None): if goal is None: @@ -284,7 +284,7 @@ def _find_cycles(edges): continue cycle.append(key) if traverse(key, goal, cycle): - cycset = util.Set(cycle) + cycset = set(cycle) for x in cycle: involved_in_cycles.add(x) if x in cycles: |