Recent versions of pycodestyle (used by flake8) flag these type comparisons accoding to flake rule E721 [1].
Comply with rule by replacing type comparisons with 'isinstance()'. https://www.flake8rules.com/rules/E721.html Signed-off-by: Adrian Moreno <amore...@redhat.com> --- python/ovs/jsonrpc.py | 2 +- tests/test-jsonrpc.py | 4 ++-- tests/test-ovsdb.py | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py index d5127268a..0cd4c3d31 100644 --- a/python/ovs/jsonrpc.py +++ b/python/ovs/jsonrpc.py @@ -377,7 +377,7 @@ class Session(object): self.stream = None self.pstream = None self.seqno = 0 - if type(remotes) != list: + if not isinstance(remotes, list): remotes = [remotes] self.remotes = remotes random.shuffle(self.remotes) diff --git a/tests/test-jsonrpc.py b/tests/test-jsonrpc.py index 1df5afa22..c3c7e547b 100644 --- a/tests/test-jsonrpc.py +++ b/tests/test-jsonrpc.py @@ -199,13 +199,13 @@ notify REMOTE METHOD PARAMS send notification and exit sys.exit(1) func, n_args = commands[command_name] - if type(n_args) == tuple: + if isinstance(n_args, tuple): if len(args) < n_args[0]: sys.stderr.write("%s: \"%s\" requires at least %d arguments but " "only %d provided\n" % (argv[0], command_name, n_args, len(args))) sys.exit(1) - elif type(n_args) == int: + elif isinstance(n_args, int): if len(args) != n_args: sys.stderr.write("%s: \"%s\" requires %d arguments but %d " "provided\n" diff --git a/tests/test-ovsdb.py b/tests/test-ovsdb.py index a841adba4..ca7ef5ea9 100644 --- a/tests/test-ovsdb.py +++ b/tests/test-ovsdb.py @@ -37,7 +37,7 @@ vlog.init(None) def unbox_json(json): - if type(json) == list and len(json) == 1: + if isinstance(json, list) and len(json) == 1: return json[0] else: return json @@ -325,9 +325,9 @@ def substitute_uuids(json, symtab): symbol = symtab.get(json) if symbol: return str(symbol) - elif type(json) == list: + elif isinstance(json, list): return [substitute_uuids(element, symtab) for element in json] - elif type(json) == dict: + elif isinstance(json, dict): d = {} for key, value in json.items(): d[key] = substitute_uuids(value, symtab) @@ -341,10 +341,10 @@ def parse_uuids(json, symtab): name = "#%d#" % len(symtab) sys.stderr.write("%s = %s\n" % (name, json)) symtab[name] = json - elif type(json) == list: + elif isinstance(json, list): for element in json: parse_uuids(element, symtab) - elif type(json) == dict: + elif isinstance(json, dict): for value in json.values(): parse_uuids(value, symtab) @@ -1049,14 +1049,14 @@ def main(argv): sys.exit(1) func, n_args = commands[command_name] - if type(n_args) == tuple: + if isinstance(n_args, tuple): if len(args) < n_args[0]: sys.stderr.write("%s: \"%s\" requires at least %d arguments but " "only %d provided\n" % (ovs.util.PROGRAM_NAME, command_name, n_args[0], len(args))) sys.exit(1) - elif type(n_args) == int: + elif isinstance(n_args, int): if len(args) != n_args: sys.stderr.write("%s: \"%s\" requires %d arguments but %d " "provided\n" -- 2.43.0 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
