From 86d16d2a98af540ba458721edc2ac8a530c01635 Mon Sep 17 00:00:00 2001 From: kshithijiyer Date: Wed, 8 Jan 2020 15:53:31 +0530 Subject: [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 --- glustolibs-gluster/glustolibs/gluster/brick_libs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'glustolibs-gluster/glustolibs/gluster/brick_libs.py') diff --git a/glustolibs-gluster/glustolibs/gluster/brick_libs.py b/glustolibs-gluster/glustolibs/gluster/brick_libs.py index f84085969..0ec9e879f 100644 --- a/glustolibs-gluster/glustolibs/gluster/brick_libs.py +++ b/glustolibs-gluster/glustolibs/gluster/brick_libs.py @@ -179,10 +179,10 @@ def bring_bricks_offline(volname, bricks_list, """ if bring_bricks_offline_methods is None: bring_bricks_offline_methods = ['service_kill'] - elif isinstance(bring_bricks_offline_methods, str): + elif not isinstance(bring_bricks_offline_methods, list): bring_bricks_offline_methods = [bring_bricks_offline_methods] - if isinstance(bricks_list, str): + if not isinstance(bricks_list, list): bricks_list = [bricks_list] node_list = [] @@ -281,7 +281,7 @@ def bring_bricks_online(mnode, volname, bricks_list, if bring_bricks_online_methods is None: bring_bricks_online_methods = ['glusterd_restart', 'volume_start_force'] - elif isinstance(bring_bricks_online_methods, str): + elif not isinstance(bring_bricks_online_methods, list): bring_bricks_online_methods = [bring_bricks_online_methods] g.log.info("Bringing bricks '%s' online with '%s'", -- cgit