From 1df82a36df74a59f55eea99d08612564fa22cbef Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Fri, 25 Jul 2014 10:53:28 -0400 Subject: Fix Python 3 compatibility of mountstats and nfs-iostat Signed-off-by: Steve Dickson --- tools/mountstats/mountstats.py | 2 +- tools/nfs-iostat/nfs-iostat.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py index e46105d..1fb3e2f 100644 --- a/tools/mountstats/mountstats.py +++ b/tools/mountstats/mountstats.py @@ -371,7 +371,7 @@ def parse_stats_file(filename): ms_dict = dict() key = '' - f = file(filename) + f = open(filename) for line in f.readlines(): words = line.split() if len(words) == 0: diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py index b324cd8..61d15a5 100644 --- a/tools/nfs-iostat/nfs-iostat.py +++ b/tools/nfs-iostat/nfs-iostat.py @@ -213,7 +213,8 @@ class DeviceData: # the reference to them. so we build new lists here # for the result object. for op in result.__rpc_data['ops']: - result.__rpc_data[op] = map(difference, self.__rpc_data[op], old_stats.__rpc_data[op]) + result.__rpc_data[op] = list(map( + difference, self.__rpc_data[op], old_stats.__rpc_data[op])) # update the remaining keys we care about result.__rpc_data['rpcsends'] -= old_stats.__rpc_data['rpcsends'] -- cgit