sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-20 08:59:06 +03:00
Code Activity

python: bulk replace dict.iteritems to items for py3

Browse Source 
In py3, iterxxx methods are removed.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Joe Guo
2018-04-11 10:32:06 +12:00
committed by Douglas Bagnall
parent 6716971ce1
commit f3b5287538
12 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/samba/graph.py
View File

@ -129,7 +129,7 @@ def shorten_vertex_names(edges, vertices, suffix=',...', aggressive=False):
break
else:
map = dict((k, v.replace(',CN=Servers,', ',**,'))
for k, v in map.iteritems())
for k, v in map.items())
replacements.append(('**', 'CN=Servers'))
for v in vertices2:
@ -137,7 +137,7 @@ def shorten_vertex_names(edges, vertices, suffix=',...', aggressive=False):
break
else:
map = dict((k, v.replace('CN=NTDS Settings,', '*,'))
for k, v in map.iteritems())
for k, v in map.items())
replacements.append(('*', 'CN=NTDS Settings'))
edges2 = [(map.get(a, a), map.get(b, b)) for a, b in edges2]
@ -463,11 +463,11 @@ def find_transitive_distance(vertices, edges):
for i in range(inf):
changed = False
new_distances = {}
for v, d in distances.iteritems():
for v, d in distances.items():
new_d = d.copy()
new_distances[v] = new_d
for dest, cost in d.iteritems():
for leaf, cost2 in distances[dest].iteritems():
for dest, cost in d.items():
for leaf, cost2 in distances[dest].items():
new_cost = cost + cost2
old_cost = d.get(leaf, inf)
if new_cost < old_cost: