Python 2.6 compatibility for the generator
git-svn-id: https://svn.kapsi.fi/jpa/nanopb@973 e3a754e5-d11d-0410-8d38-ebb782a927b9
This commit is contained in:
@@ -327,15 +327,15 @@ def toposort2(data):
|
|||||||
for k, v in data.items():
|
for k, v in data.items():
|
||||||
v.discard(k) # Ignore self dependencies
|
v.discard(k) # Ignore self dependencies
|
||||||
extra_items_in_deps = reduce(set.union, data.values()) - set(data.keys())
|
extra_items_in_deps = reduce(set.union, data.values()) - set(data.keys())
|
||||||
data.update({item:set() for item in extra_items_in_deps})
|
data.update(dict([(item, set()) for item in extra_items_in_deps]))
|
||||||
while True:
|
while True:
|
||||||
ordered = set(item for item,dep in data.items() if not dep)
|
ordered = set(item for item,dep in data.items() if not dep)
|
||||||
if not ordered:
|
if not ordered:
|
||||||
break
|
break
|
||||||
for item in sorted(ordered):
|
for item in sorted(ordered):
|
||||||
yield item
|
yield item
|
||||||
data = {item: (dep - ordered) for item,dep in data.items()
|
data = dict([(item, (dep - ordered)) for item,dep in data.items()
|
||||||
if item not in ordered}
|
if item not in ordered])
|
||||||
assert not data, "A cyclic dependency exists amongst %r" % data
|
assert not data, "A cyclic dependency exists amongst %r" % data
|
||||||
|
|
||||||
def sort_dependencies(messages):
|
def sort_dependencies(messages):
|
||||||
|
|||||||
Reference in New Issue
Block a user