From ee72f59247be3613587770a6e5fd1e3d9de6c11d Mon Sep 17 00:00:00 2001 From: Serge Guelton Date: Thu, 3 Jan 2019 14:12:37 +0000 Subject: [PATCH] Python compat - has_key vs. in operator Use portable `in` operator instead of `has_key(...)` method. Differential Revision: https://reviews.llvm.org/D56260 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350314 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/release/findRegressions-nightly.py | 20 ++++++++++---------- utils/release/findRegressions-simple.py | 16 ++++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/utils/release/findRegressions-nightly.py b/utils/release/findRegressions-nightly.py index 7654667f8fa..e7e13b08381 100755 --- a/utils/release/findRegressions-nightly.py +++ b/utils/release/findRegressions-nightly.py @@ -36,7 +36,7 @@ def parse(file): else: fname = tmp[0].strip('\r\n') - if not test.has_key(fname) : + if fname not in test : test[fname] = {} for k in test: @@ -77,12 +77,12 @@ def diffResults(d_old, d_new): if DEBUG: print(t) - if d_new.has_key(t) : + if t in d_new : # Check if the test passed or failed. for x in test: - if d_old[t].has_key(x): - if d_new[t].has_key(x): + if x in d_old[t]: + if x in d_new[t]: if d_old[t][x] == 'PASS': if d_new[t][x] != 'PASS': print(t + " *** REGRESSION (" + x + ")\n") @@ -95,22 +95,22 @@ def diffResults(d_old, d_new): # For execution time, if there is no result, its a fail. for x in exectime: - if d_old[t].has_key(tp + x): - if not d_new[t].has_key(tp + x): + if tp + x in d_old[t]: + if tp + x not in d_new[t]: print(t + " *** REGRESSION (" + tp + x + ")\n") else : - if d_new[t].has_key(tp + x): + if tp + x in d_new[t]: print(t + " * NEW PASS (" + tp + x + ")\n") for x in comptime: - if d_old[t].has_key(exp + x): - if not d_new[t].has_key(exp + x): + if exp + x in d_old[t]: + if exp + x not in d_new[t]: print(t + " *** REGRESSION (" + exp + x + ")\n") else : - if d_new[t].has_key(exp + x): + if exp + x in d_new[t]: print(t + " * NEW PASS (" + exp + x + ")\n") else : diff --git a/utils/release/findRegressions-simple.py b/utils/release/findRegressions-simple.py index 2f3b66cab90..7bd1523b58f 100755 --- a/utils/release/findRegressions-simple.py +++ b/utils/release/findRegressions-simple.py @@ -33,7 +33,7 @@ def parse(file): else: fname = tmp[0].strip('\r\n') - if not test.has_key(fname): + if fname not in test: test[fname] = {} test[fname][t[1] + ' state'] = t[0] @@ -73,16 +73,16 @@ def diffResults(d_old, d_new): passes[x] = '' for t in sorted(d_old.keys()) : - if d_new.has_key(t): + if t in d_new: # Check if the test passed or failed. for x in ['compile state', 'compile time', 'exec state', 'exec time']: - if not d_old[t].has_key(x) and not d_new[t].has_key(x): + if x not in d_old[t] and x not in d_new[t]: continue - if d_old[t].has_key(x): - if d_new[t].has_key(x): + if x in d_old[t]: + if x in d_new[t]: if d_old[t][x] == 'PASS': if d_new[t][x] != 'PASS': @@ -98,11 +98,11 @@ def diffResults(d_old, d_new): continue # For execution time, if there is no result it's a fail. - if not d_old[t].has_key(x) and not d_new[t].has_key(x): + if x not in d_old[t] and x not in d_new[t]: continue - elif not d_new[t].has_key(x): + elif x not in d_new[t]: regressions[x] += t + "\n" - elif not d_old[t].has_key(x): + elif x not in d_old[t]: passes[x] += t + "\n" if math.isnan(d_old[t][x]) and math.isnan(d_new[t][x]): -- 2.50.1