From fc9b6f94a899eaa9b32fecde0b7a2d9b0a1f65e5 Mon Sep 17 00:00:00 2001 From: Sun Austin Date: Tue, 18 Dec 2018 13:10:58 +0800 Subject: [PATCH] Fix: "map" issue for Python 2/3 compatible code Replace map(func, data) with [func(item) for item in data] Story: 2002909 Task: 24563 Change-Id: I83004eeba036908da483b247093818a6ac3f19c1 Signed-off-by: Sun Austin --- tools/engtools/hostdata-collectors/scripts/buddyinfo.py | 2 +- tools/vm-topology/vm-topology/vm_topology/exec/vm_topology.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/engtools/hostdata-collectors/scripts/buddyinfo.py b/tools/engtools/hostdata-collectors/scripts/buddyinfo.py index 2737fe408..b20435d6d 100644 --- a/tools/engtools/hostdata-collectors/scripts/buddyinfo.py +++ b/tools/engtools/hostdata-collectors/scripts/buddyinfo.py @@ -57,7 +57,7 @@ class BuddyInfo(object): for line in map(self.parse_line, buddyinfo): numa_node = int(line["numa_node"]) zone = line["zone"] - free_fragments = map(int, line["nr_free"].split()) + free_fragments = [int(nr) for nr in line["nr_free"].split()] max_order = len(free_fragments) fragment_sizes = self.get_order_sizes(max_order) usage_in_bytes = [block[0] * block[1] for block in zip(free_fragments, fragment_sizes)] diff --git a/tools/vm-topology/vm-topology/vm_topology/exec/vm_topology.py b/tools/vm-topology/vm-topology/vm_topology/exec/vm_topology.py index 6f3d0f1a6..dbf8f81d0 100644 --- a/tools/vm-topology/vm-topology/vm_topology/exec/vm_topology.py +++ b/tools/vm-topology/vm-topology/vm_topology/exec/vm_topology.py @@ -492,7 +492,7 @@ def range_to_list(csv_range=None): """ if not csv_range: return [] - ranges = [(lambda L: range(L[0], L[-1] + 1))(map(int, r.split('-'))) + ranges = [(lambda L: range(L[0], L[-1] + 1))([int(x) for x in r.split('-')]) for r in csv_range.split(',')] return [y for x in ranges for y in x]