[Fuego] [PATCH 2/2] python2to3: change dict.has_key(key) to key in dict

From: Shivanand Kunijadar <[email protected]>

It is compatible with both python2 and python3 interpreters

Signed-off-by: Shivanand Kunijadar <[email protected]>
---
 scripts/deorphan-runs.py             | 4 ++--
 scripts/parser/common.py             | 6 +++---
 scripts/parser/prepare_chart_data.py | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/deorphan-runs.py b/scripts/deorphan-runs.py
index 1148d4d..c81ed24 100755
--- a/scripts/deorphan-runs.py
+++ b/scripts/deorphan-runs.py
@@ -62,12 +62,12 @@ class data_class:
 
     def __getitem__(self, key):
         # return value for key
-        if self.data.has_key(key):
+        if key in self.data:
             item = self.data[key]
         elif hasattr(self, key):
             item = getattr(self, key)
         else:
-            if self.data.has_key("default"):
+            if "default" in self.data:
                 item = self.data["default"]
             else:
                 item = "missing data value for key '%s'" % key
diff --git a/scripts/parser/common.py b/scripts/parser/common.py
index 19bbcb0..d7dcfbd 100644
--- a/scripts/parser/common.py
+++ b/scripts/parser/common.py
@@ -312,7 +312,7 @@ def decide_status(tguid, criteria_data, child_pass_list, child_fail_list):
     if not min_pass and must_pass_list:
         min_pass = len(must_pass_list)
 
-    have_max_fail=criterion.has_key("max_fail")
+    have_max_fail="max_fail" in criterion
     if have_max_fail:
         max_fail = criterion.get('max_fail')
     elif len(fail_ok_list)>0:
@@ -421,7 +421,7 @@ def load_criteria():
     rw_board_crit_filename = "%s/boards/%s-%s-criteria.json" % (FUEGO_RW, NODE_NAME, TESTDIR)
 
     # user-specified path takes precedence
-    if os.environ.has_key('FUEGO_CRITERIA_JSON_PATH'):
+    if 'FUEGO_CRITERIA_JSON_PATH' in os.environ:
         criteria_filename = os.environ['FUEGO_CRITERIA_JSON_PATH']
     elif os.path.exists(ro_board_crit_filename):
         criteria_filename = ro_board_crit_filename
@@ -737,7 +737,7 @@ def process_data(ref_section_pat, test_results, plot_type, label):
         ts_name, tc_name, measure = split_old_id(old_id)
         test_case_id = "%s.%s" % (ts_name, tc_name)
         new_measure = {"name":measure, "measure": float(value)}
-        if not measurements.has_key(test_case_id):
+        if test_case_id not in measurements:
             measurements[test_case_id] = [new_measure]
         else:
             measurements[test_case_id].append(new_measure)
diff --git a/scripts/parser/prepare_chart_data.py b/scripts/parser/prepare_chart_data.py
index 1868f39..9aea666 100644
--- a/scripts/parser/prepare_chart_data.py
+++ b/scripts/parser/prepare_chart_data.py
@@ -245,7 +245,7 @@ def store_flat_results(test_logdir, run_data, criteria_data):
             plot_file.write(line)
             data_lines.append(line)
 
-            if test_case.has_key("measurements"):
+            if "measurements" in test_case:
                 measurements = test_case["measurements"]
                 for measure in measurements:
                     m_name = measure["name"]
@@ -851,7 +851,7 @@ def make_testset_summary_table(test_name, chart_config, entries):
                 kernel_list.append(entry.kernel)
 
             ssb_key = entry.spec + "," + entry.test_set + "," + str(entry.build_number)
-            if not ssb_map.has_key(ssb_key):
+            if ssb_key not in ssb_map:
                 ssb_map[ssb_key] = [0,0,0,0]
 
             if entry.result=="PASS":
-- 
2.20.1