提交 d1cf7ceb authored 作者: Frederic Bastien's avatar Frederic Bastien 提交者: Reyhane Askari

Convert some OrderedSet when we only check if element are in the set or don't…

Convert some OrderedSet when we only check if element are in the set or don't care about the iteration order. Only local changes.
上级 e4a1061f
...@@ -418,7 +418,7 @@ if 0: ...@@ -418,7 +418,7 @@ if 0:
# self.debug_all_apps.remove(app) # self.debug_all_apps.remove(app)
# UPDATE self.clients # UPDATE self.clients
for i, input in enumerate(OrderedSet(app.inputs)): for i, input in enumerate(set(app.inputs)):
del self.clients[input][app] del self.clients[input][app]
if getattr(app.op, 'destroy_map', {}): if getattr(app.op, 'destroy_map', {}):
...@@ -583,18 +583,16 @@ if 0: ...@@ -583,18 +583,16 @@ if 0:
'destroyhandler_tolerate_same', 'destroyhandler_tolerate_same',
[]) [])
assert isinstance(tolerate_same, list) assert isinstance(tolerate_same, list)
tolerated = OrderedSet(idx1 for idx0, idx1 in tolerated = set(idx1 for idx0, idx1 in
tolerate_same tolerate_same
if idx0 == destroyed_idx) if idx0 == destroyed_idx)
tolerated.add(destroyed_idx) tolerated.add(destroyed_idx)
tolerate_aliased = getattr( tolerate_aliased = getattr(
app.op, 'destroyhandler_tolerate_aliased', []) app.op, 'destroyhandler_tolerate_aliased', [])
assert isinstance(tolerate_aliased, list) assert isinstance(tolerate_aliased, list)
ignored = OrderedSet(idx1 for idx0, idx1 ignored = set(idx1 for idx0, idx1
in tolerate_aliased in tolerate_aliased
if idx0 == destroyed_idx) if idx0 == destroyed_idx)
# print 'tolerated', tolerated
# print 'ignored', ignored
for i, input in enumerate(app.inputs): for i, input in enumerate(app.inputs):
if i in ignored: if i in ignored:
continue continue
...@@ -877,7 +875,7 @@ class DestroyHandler(toolbox.Bookkeeper): # noqa ...@@ -877,7 +875,7 @@ class DestroyHandler(toolbox.Bookkeeper): # noqa
self.debug_all_apps.remove(app) self.debug_all_apps.remove(app)
# UPDATE self.clients # UPDATE self.clients
for i, input in enumerate(OrderedSet(app.inputs)): for i, input in enumerate(set(app.inputs)):
del self.clients[input][app] del self.clients[input][app]
if getattr(app.op, 'destroy_map', OrderedDict()): if getattr(app.op, 'destroy_map', OrderedDict()):
...@@ -1073,16 +1071,14 @@ class DestroyHandler(toolbox.Bookkeeper): # noqa ...@@ -1073,16 +1071,14 @@ class DestroyHandler(toolbox.Bookkeeper): # noqa
tolerate_same = getattr(app.op, tolerate_same = getattr(app.op,
'destroyhandler_tolerate_same', []) 'destroyhandler_tolerate_same', [])
assert isinstance(tolerate_same, list) assert isinstance(tolerate_same, list)
tolerated = OrderedSet(idx1 for idx0, idx1 in tolerate_same tolerated = set(idx1 for idx0, idx1 in tolerate_same
if idx0 == destroyed_idx) if idx0 == destroyed_idx)
tolerated.add(destroyed_idx) tolerated.add(destroyed_idx)
tolerate_aliased = getattr( tolerate_aliased = getattr(
app.op, 'destroyhandler_tolerate_aliased', []) app.op, 'destroyhandler_tolerate_aliased', [])
assert isinstance(tolerate_aliased, list) assert isinstance(tolerate_aliased, list)
ignored = OrderedSet(idx1 for idx0, idx1 in tolerate_aliased ignored = set(idx1 for idx0, idx1 in tolerate_aliased
if idx0 == destroyed_idx) if idx0 == destroyed_idx)
# print 'tolerated', tolerated
# print 'ignored', ignored
for i, input in enumerate(app.inputs): for i, input in enumerate(app.inputs):
if i in ignored: if i in ignored:
continue continue
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论