Re: [PATCH] Fix Python 3 compatibility of mountstats and nfs-iostat

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 17/07/14 05:57, Slavek Kabrda wrote:
> Signed-off-by: Slavek Kabrda <bkabrda@xxxxxxxxxx>
Committed... 

steved.
> ---
>  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']
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux