From 4f56de6709cd0c4e036b511b4202e53594cc4d1c Mon Sep 17 00:00:00 2001 From: Chih-Ming Chen Date: Mon, 20 Nov 2017 05:07:48 +0800 Subject: [PATCH] replace `has_key` by `in` (#8317) * replace `has_key` by `in` * Update utils.py --- python/mxnet/notebook/callback.py | 2 +- tests/nightly/TestDoc/doc_spell_checker.py | 2 +- tools/accnn/rank_selection.py | 2 +- tools/accnn/utils.py | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python/mxnet/notebook/callback.py b/python/mxnet/notebook/callback.py index 56321b715b40..776900fe59f5 100644 --- a/python/mxnet/notebook/callback.py +++ b/python/mxnet/notebook/callback.py @@ -367,7 +367,7 @@ def _process_batch(self, param, df_name): metrics = {} metrics['elapsed'] = datetime.datetime.now() - self.start_time for key, value in metrics.items(): - if not self._data[df_name].has_key(key): + if key not in self._data[df_name]: self._data[df_name][key] = [] self._data[df_name][key].append(value) diff --git a/tests/nightly/TestDoc/doc_spell_checker.py b/tests/nightly/TestDoc/doc_spell_checker.py index a7b8b250c928..a33807e3d576 100644 --- a/tests/nightly/TestDoc/doc_spell_checker.py +++ b/tests/nightly/TestDoc/doc_spell_checker.py @@ -92,7 +92,7 @@ def check_doc(file_content, spell_checker, spell_check_ret): """ spell_checker.set_text(file_content) for error in spell_checker: - if spell_check_ret.has_key(error.word): + if error.word in spell_check_ret: spell_check_ret[error.word] += 1 else: spell_check_ret[error.word] = 1 diff --git a/tools/accnn/rank_selection.py b/tools/accnn/rank_selection.py index 66937b2859b9..c5c026114aeb 100644 --- a/tools/accnn/rank_selection.py +++ b/tools/accnn/rank_selection.py @@ -81,7 +81,7 @@ def get_ranksel(model, ratio): if nxt_c > EC: continue nxt_v = dp[now][now_c] + math.log(S[i][d]) - if dp[nxt].has_key(nxt_c): + if nxt_c in dp[nxt]: if nxt_v > dp[nxt][nxt_c]: dp[nxt][nxt_c] = nxt_v dpc[i][nxt_c] = (d,now_c) diff --git a/tools/accnn/utils.py b/tools/accnn/utils.py index 25fb18895620..2795f8558f7a 100644 --- a/tools/accnn/utils.py +++ b/tools/accnn/utils.py @@ -20,6 +20,7 @@ import json import ast + def load_model(args): devs = mx.cpu() if args.gpus == None else [mx.gpu(int(i)) for i in args.gpus.split(',')] return mx.model.FeedForward.load(args.model, args.load_epoch, ctx=devs) @@ -29,7 +30,7 @@ def topsort(nodes): deg = [0]*n g = [[] for _ in xrange(n)] for i,node in enumerate(nodes): - if node.has_key('inputs'): + if 'inputs' in node: for j in node['inputs']: deg[i] += 1 g[j[0]].append(i) @@ -45,7 +46,7 @@ def topsort(nodes): q.append(j) new_ids=dict([(node['name'],i) for i,node in enumerate(res)]) for node in res: - if node.has_key('inputs'): + if 'inputs' in node: for j in node['inputs']: j[0]=new_ids[nodes[j[0]]['name']] return res