2019-03-24 21:34:23

by Matthew Ruffell

[permalink] [raw]
Subject: [PATCH] nfsiostat: replace 'list' reserved word

list is a reserved word in python and should not be used as a variable
name. Changing list to devicelist for list_nfs_mounts()

Fixes: https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/1821261

Signed-off-by: Matthew Ruffell <[email protected]>
---
tools/nfs-iostat/nfs-iostat.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
index 7cbe543..dec0e86 100644
--- a/tools/nfs-iostat/nfs-iostat.py
+++ b/tools/nfs-iostat/nfs-iostat.py
@@ -493,20 +493,20 @@ def list_nfs_mounts(givenlist, mountstats):
return a full list if the given list is empty -
may return an empty list if none found
"""
- list = []
+ devicelist = []
if len(givenlist) > 0:
for device in givenlist:
stats = DeviceData()
stats.parse_stats(mountstats[device])
if stats.is_nfs_mountpoint():
- list += [device]
+ devicelist += [device]
else:
for device, descr in mountstats.items():
stats = DeviceData()
stats.parse_stats(descr)
if stats.is_nfs_mountpoint():
- list += [device]
- return list
+ devicelist += [device]
+ return devicelist

def iostat_command(name):
"""iostat-like command for NFS mount points
--
2.19.1



2019-03-25 23:23:17

by J. Bruce Fields

[permalink] [raw]
Subject: Re: [PATCH] nfsiostat: replace 'list' reserved word

Adding steved to cc.--b.

On Mon, Mar 25, 2019 at 10:33:18AM +1300, Matthew Ruffell wrote:
> list is a reserved word in python and should not be used as a variable
> name. Changing list to devicelist for list_nfs_mounts()
>
> Fixes: https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/1821261
>
> Signed-off-by: Matthew Ruffell <[email protected]>
> ---
> tools/nfs-iostat/nfs-iostat.py | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
> index 7cbe543..dec0e86 100644
> --- a/tools/nfs-iostat/nfs-iostat.py
> +++ b/tools/nfs-iostat/nfs-iostat.py
> @@ -493,20 +493,20 @@ def list_nfs_mounts(givenlist, mountstats):
> return a full list if the given list is empty -
> may return an empty list if none found
> """
> - list = []
> + devicelist = []
> if len(givenlist) > 0:
> for device in givenlist:
> stats = DeviceData()
> stats.parse_stats(mountstats[device])
> if stats.is_nfs_mountpoint():
> - list += [device]
> + devicelist += [device]
> else:
> for device, descr in mountstats.items():
> stats = DeviceData()
> stats.parse_stats(descr)
> if stats.is_nfs_mountpoint():
> - list += [device]
> - return list
> + devicelist += [device]
> + return devicelist
>
> def iostat_command(name):
> """iostat-like command for NFS mount points
> --
> 2.19.1

2019-03-28 20:06:07

by Steve Dickson

[permalink] [raw]
Subject: Re: [PATCH] nfsiostat: replace 'list' reserved word



On 3/24/19 5:33 PM, Matthew Ruffell wrote:
> list is a reserved word in python and should not be used as a variable
> name. Changing list to devicelist for list_nfs_mounts()
>
> Fixes: https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/1821261
>
> Signed-off-by: Matthew Ruffell <[email protected]>
Committed...

steved.
> ---
> tools/nfs-iostat/nfs-iostat.py | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
> index 7cbe543..dec0e86 100644
> --- a/tools/nfs-iostat/nfs-iostat.py
> +++ b/tools/nfs-iostat/nfs-iostat.py
> @@ -493,20 +493,20 @@ def list_nfs_mounts(givenlist, mountstats):
> return a full list if the given list is empty -
> may return an empty list if none found
> """
> - list = []
> + devicelist = []
> if len(givenlist) > 0:
> for device in givenlist:
> stats = DeviceData()
> stats.parse_stats(mountstats[device])
> if stats.is_nfs_mountpoint():
> - list += [device]
> + devicelist += [device]
> else:
> for device, descr in mountstats.items():
> stats = DeviceData()
> stats.parse_stats(descr)
> if stats.is_nfs_mountpoint():
> - list += [device]
> - return list
> + devicelist += [device]
> + return devicelist
>
> def iostat_command(name):
> """iostat-like command for NFS mount points
>