[Sqlalchemy-commits] [6011] sqlalchemy/trunk: slight cleanup i want in 0.5/0.6
Brought to you by:
zzzeek
From: <co...@sq...> - 2009-05-31 21:28:02
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[6011] sqlalchemy/trunk: slight cleanup i want in 0.5/0.6</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>6011</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2009-05-31 17:27:56 -0400 (Sun, 31 May 2009)</dd> </dl> <h3>Log Message</h3> <pre>slight cleanup i want in 0.5/0.6</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemytopologicalpy">sqlalchemy/trunk/lib/sqlalchemy/topological.py</a></li> <li><a href="#sqlalchemytrunktestbasedependencypy">sqlalchemy/trunk/test/base/dependency.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemytopologicalpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/topological.py (6010 => 6011)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/topological.py 2009-05-31 19:30:39 UTC (rev 6010) +++ sqlalchemy/trunk/lib/sqlalchemy/topological.py 2009-05-31 21:27:56 UTC (rev 6011) </span><span class="lines">@@ -19,6 +19,7 @@ </span><span class="cx"> """ </span><span class="cx"> </span><span class="cx"> from sqlalchemy.exc import CircularDependencyError </span><ins>+from sqlalchemy import util </ins><span class="cx"> </span><span class="cx"> __all__ = ['sort', 'sort_with_cycles', 'sort_as_tree'] </span><span class="cx"> </span><span class="lines">@@ -93,18 +94,14 @@ </span><span class="cx"> """A collection of directed edges.""" </span><span class="cx"> </span><span class="cx"> def __init__(self): </span><del>- self.parent_to_children = {} - self.child_to_parents = {} </del><ins>+ self.parent_to_children = util.defaultdict(set) + self.child_to_parents = util.defaultdict(set) </ins><span class="cx"> </span><span class="cx"> def add(self, edge): </span><span class="cx"> """Add an edge to this collection.""" </span><span class="cx"> </span><del>- (parentnode, childnode) = edge - if parentnode not in self.parent_to_children: - self.parent_to_children[parentnode] = set() </del><ins>+ parentnode, childnode = edge </ins><span class="cx"> self.parent_to_children[parentnode].add(childnode) </span><del>- if childnode not in self.child_to_parents: - self.child_to_parents[childnode] = set() </del><span class="cx"> self.child_to_parents[childnode].add(parentnode) </span><span class="cx"> parentnode.dependencies.add(childnode) </span><span class="cx"> </span><span class="lines">@@ -117,13 +114,13 @@ </span><span class="cx"> (parentnode, childnode) = edge </span><span class="cx"> self.parent_to_children[parentnode].remove(childnode) </span><span class="cx"> self.child_to_parents[childnode].remove(parentnode) </span><del>- if len(self.child_to_parents[childnode]) == 0: </del><ins>+ if not self.child_to_parents[childnode]: </ins><span class="cx"> return childnode </span><span class="cx"> else: </span><span class="cx"> return None </span><span class="cx"> </span><span class="cx"> def has_parents(self, node): </span><del>- return node in self.child_to_parents and len(self.child_to_parents[node]) > 0 </del><ins>+ return node in self.child_to_parents and bool(self.child_to_parents[node]) </ins><span class="cx"> </span><span class="cx"> def edges_by_parent(self, node): </span><span class="cx"> if node in self.parent_to_children: </span></span></pre></div> <a id="sqlalchemytrunktestbasedependencypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/base/dependency.py (6010 => 6011)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/base/dependency.py 2009-05-31 19:30:39 UTC (rev 6010) +++ sqlalchemy/trunk/test/base/dependency.py 2009-05-31 21:27:56 UTC (rev 6011) </span><span class="lines">@@ -24,16 +24,16 @@ </span><span class="cx"> assert_tuple(list(tuple), node) </span><span class="cx"> </span><span class="cx"> if collection is None: </span><del>- collection = [] </del><ins>+ collection = set() </ins><span class="cx"> items = set() </span><del>- def assert_unique(node): - for item in [i for i in node[1] or [node[0]]]: - assert item not in items </del><ins>+ def assert_unique(n): + for item in [i for i in n[1] or [n[0]]]: + assert item not in items, node </ins><span class="cx"> items.add(item) </span><span class="cx"> if item in collection: </span><span class="cx"> collection.remove(item) </span><del>- for c in node[2]: - assert_unique(c) </del><ins>+ for item in n[2]: + assert_unique(item) </ins><span class="cx"> assert_unique(node) </span><span class="cx"> assert len(collection) == 0 </span><span class="cx"> </span><span class="lines">@@ -171,8 +171,10 @@ </span><span class="cx"> self.assert_sort(tuples, head) </span><span class="cx"> </span><span class="cx"> def testcircular3(self): </span><del>- nodes = {} - tuples = [('Question', 'Issue'), ('ProviderService', 'Issue'), ('Provider', 'Question'), ('Question', 'Provider'), ('ProviderService', 'Question'), ('Provider', 'ProviderService'), ('Question', 'Answer'), ('Issue', 'Question')] </del><ins>+ question, issue, providerservice, answer, provider = "Question", "Issue", "ProviderService", "Answer", "Provider" + + tuples = [(question, issue), (providerservice, issue), (provider, question), (question, provider), (providerservice, question), (provider, providerservice), (question, answer), (issue, question)] + </ins><span class="cx"> head = topological.sort_as_tree(tuples, [], with_cycles=True) </span><span class="cx"> self.assert_sort(tuples, head) </span><span class="cx"> </span></span></pre> </div> </div> </body> </html> |