[MERGE] forward port branch saas-17 up to 877e7098719

1 files changed, 7 insertions, 9 deletions

diff --git a/odoo/tools/graph.py b/odoo/tools/graph.py
index 5e3edabf05a..d43088d97ab 100755
--- a/odoo/tools/graph.py
+++ b/odoo/tools/graph.py
@@ -5,8 +5,6 @@
 import operator
 import math
 
-from odoo.tools import pycompat
-
 
 class graph(object):
     def __init__(self, nodes, transitions, no_ancester=None):
@@ -259,7 +257,7 @@ class graph(object):
         """The ranks are normalized by setting the least rank to zero.
         """
 
-        least_rank = min(x['x'] for x in pycompat.values(self.result.values))
+        least_rank = min(x['x'] for x in self.result.values.values())
 
         if least_rank!=0:
             for node in self.result:
@@ -383,7 +381,7 @@ class graph(object):
         """Finds actual-order of the nodes with respect to maximum number of nodes in a rank in component
         """
         mid_pos = 0.0
-        max_level = max(len(x) for x in pycompat.values(self.levels.values))
+        max_level = max(len(x) for x in self.levels.values.values())
 
         for level in self.levels:
             if level:
@@ -474,7 +472,7 @@ class graph(object):
         """
 
         if self.Is_Cyclic:
-            max_level = max(len(x) for x in pycompat.values(self.levels.values))
+            max_level = max(len(x) for x in self.levels.values.values())
 
             if max_level%2:
                 self.result[self.start]['y'] = (max_level+1)/2 + self.max_order + (self.max_order and 1)
@@ -486,7 +484,7 @@ class graph(object):
         else:
             self.result[self.start]['y'] = 0
             self.tree_order(self.start, 0)
-            min_order = math.fabs(min(x['y'] for x in pycompat.values(self.result.values)))
+            min_order = math.fabs(min(x['y'] for x in self.result.values.values()))
 
             index = self.start_nodes.index(self.start)
             same = False
@@ -540,7 +538,7 @@ class graph(object):
                     self.result[start]['y'] = base + factor
                     factor += 1
 
-            self.max_order = max(x['y'] for x in pycompat.values(self.result.values))
+            self.max_order = max(x['y'] for x in self.result.values.values())
 
     def find_starts(self):
         """Finds other start nodes of the graph in the case when graph is disconneted
@@ -660,7 +658,7 @@ class graph(object):
 
                 for node in self.no_ancester:
                     for sec_node in self.transitions.get(node, []):
-                        if sec_node in pycompat.keys(self.partial_order):
+                        if sec_node in self.partial_order:
                             self.transitions[self.start_nodes[0]].append(node)
                             break
 
@@ -746,7 +744,7 @@ if __name__=='__main__':
     for node in nodes:
         node_res[node] = result[node]
 
-    for name,node in pycompat.items(node_res):
+    for name, node in node_res.items():
 
         draw.arc( (int(node['y']-radius), int(node['x']-radius),int(node['y']+radius), int(node['x']+radius) ), 0, 360, (128,128,128))
         draw.text( (int(node['y']),  int(node['x'])), str(name),  (128,128,128))