提交 951385af 编写于 作者: D desbma

Fixes for Python 2.7

上级 dd4928ae
...@@ -118,10 +118,11 @@ class ProcessTreeNode(object): ...@@ -118,10 +118,11 @@ class ProcessTreeNode(object):
if not self.children_sorted: if not self.children_sorted:
# optimization to avoid sorting twice (once when limiting the maximum processes to grab stats for, # optimization to avoid sorting twice (once when limiting the maximum processes to grab stats for,
# and once before displaying) # and once before displaying)
self.children.sort(key=__class__.getWeight, reverse=self.reverse_sorting) self.children.sort(key=self.__class__.getWeight, reverse=self.reverse_sorting)
self.children_sorted = True self.children_sorted = True
for child in self.children: for child in self.children:
yield from iter(child) for n in iter(child):
yield n
def iterChildren(self, exclude_incomplete_stats=True): def iterChildren(self, exclude_incomplete_stats=True):
""" """
...@@ -134,7 +135,7 @@ class ProcessTreeNode(object): ...@@ -134,7 +135,7 @@ class ProcessTreeNode(object):
if not self.children_sorted: if not self.children_sorted:
# optimization to avoid sorting twice (once when limiting the maximum processes to grab stats for, # optimization to avoid sorting twice (once when limiting the maximum processes to grab stats for,
# and once before displaying) # and once before displaying)
self.children.sort(key=__class__.getWeight, reverse=self.reverse_sorting) self.children.sort(key=self.__class__.getWeight, reverse=self.reverse_sorting)
self.children_sorted = True self.children_sorted = True
for child in self.children: for child in self.children:
if (not exclude_incomplete_stats) or ("time_since_update" in child.stats): if (not exclude_incomplete_stats) or ("time_since_update" in child.stats):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册