diff options
author | kshithijiyer <kshithij.ki@gmail.com> | 2020-01-08 15:53:31 +0530 |
---|---|---|
committer | Bala Konda Reddy M <bmekala@redhat.com> | 2020-01-09 06:34:21 +0000 |
commit | 86d16d2a98af540ba458721edc2ac8a530c01635 (patch) | |
tree | 87ed772c0cfa44807835df4e4bf81d9e0eaeb21d /glustolibs-gluster/glustolibs/gluster/volume_libs.py | |
parent | b708cf61e66e810a9d6f1da8d3bbadcf8b38ee3b (diff) |
[py2to3] Change str to list in isinstance()
Use 'list' object type in comparisons instead of 'str'
Because it is differently treated in py2 and py3.
Example:
In py2 isinstance(u'foo', str) is False
In py3 isinstance(u'foo', str) is True
Change-Id: I7663d42494bf59d74550ff4897379d35cc357db4
Signed-off-by: kshithijiyer <kshithij.ki@gmail.com>
Diffstat (limited to 'glustolibs-gluster/glustolibs/gluster/volume_libs.py')
-rw-r--r-- | glustolibs-gluster/glustolibs/gluster/volume_libs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/volume_libs.py b/glustolibs-gluster/glustolibs/gluster/volume_libs.py index 36e1fc10c..e5a4f4f1c 100644 --- a/glustolibs-gluster/glustolibs/gluster/volume_libs.py +++ b/glustolibs-gluster/glustolibs/gluster/volume_libs.py @@ -1143,7 +1143,7 @@ def enable_and_validate_volume_options(mnode, volname, volume_options_list, bool: True when enabling and validating all volume options is successful. False otherwise """ - if isinstance(volume_options_list, str): + if not isinstance(volume_options_list, list): volume_options_list = [volume_options_list] for option in volume_options_list: @@ -1864,7 +1864,7 @@ def replace_brick_from_volume(mnode, volname, servers, all_servers_info, bool: True if replacing brick from the volume is successful. False otherwise. """ - if isinstance(servers, str): + if not isinstance(servers, list): servers = [servers] # Check if volume exists @@ -2190,7 +2190,7 @@ def get_files_and_dirs_from_brick(brick_node, brick_path, raise RuntimeError("Not specified object type to find dir/files") skip_items = ["'.glusterfs'", "'.trashcan'"] - if isinstance(skip, str): + if not isinstance(skip, list): skip_items.append("'%s'" % skip) exclude_pattern = ' '.join([' | grep -ve {}'.format(item) |