提交 a5f511a2 authored 作者: David Warde-Farley's avatar David Warde-Farley 提交者: Arnaud Bergeron

Get rid of has_key.

上级 4156fa01
......@@ -333,7 +333,7 @@ def unify_walk(d1, d2, U):
Tries to unify values of corresponding keys.
"""
for (k1, v1) in d1.items():
if d2.has_key(k1):
if k1 in d2:
U = unify_walk(v1, d2[k1], U)
if U is False:
return False
......@@ -411,12 +411,12 @@ def unify_merge(l1, l2, U):
def unify_merge(d1, d2, U):
d = d1.__class__()
for k1, v1 in d1.items():
if d2.has_key(k1):
if k1 in d2:
d[k1] = unify_merge(v1, d2[k1], U)
else:
d[k1] = unify_merge(v1, v1, U)
for k2, v2 in d2.items():
if not d1.has_key(k2):
if k2 not in d1:
d[k2] = unify_merge(v2, v2, U)
return d
......
......@@ -1368,10 +1368,9 @@ class test_fusion(unittest.TestCase):
nd = objgraph.typestats()
print('key, old val, new val, diff')
for key in set(d.keys() + nd.keys()):
if d.has_key(key) and nd.has_key(key) and nd[key] != d[key]:
if key in d and key in nd and nd[key] != d[key]:
print(key, d.get(key), nd.get(key), end=' ')
if d.has_key(
key) and nd.has_key(key):
if key in d and key in nd:
print(nd[key] - d[key])
else:
print(None)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论