python compat - has_key

[michaelplatings]

LGTM

llvm/trunk/utils/release/findRegressions-nightly.py

if t[0] == 'PASS' or t[0] == 'FAIL' :
       if DEBUG:
         print(tmp)
       
       if len(tmp) == 2:
         fname = tmp[1].strip('\r\n')
       else:
         fname = tmp[0].strip('\r\n')
       
-      if not test.has_key(fname) :
+      if fname not in test :
         test[fname] = {}
       
       for k in test:
         test[fname][k] = 'NA'
         test[fname][t[1]] = t[0]
         if DEBUG:
           print(test[fname][t[1]])
     else :

 
 # Diff results and look for regressions.
 def diffResults(d_old, d_new):
 
   for t in sorted(d_old.keys()) :
     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")
             else:
               if d_new[t][x] == 'PASS':
                 print(t + " * NEW PASS (" + x + ")\n")
                 
           else :
             print(t + "*** REGRESSION (" + x + ")\n")
         
         # 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 :
       print(t + ": Removed from test-suite.\n")
     
 
 #Main
 if len(sys.argv) < 3 :

llvm/trunk/utils/release/findRegressions-simple.py

if t[0] == 'PASS' or t[0] == 'FAIL' :
       if DEBUG:
         print(tmp)
 
       if len(tmp) == 2:
         fname = tmp[1].strip('\r\n')
       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]
       test[fname][t[1] + ' time'] = float('nan')
     else :
       try:
         n = t[0].split('RESULT-')[1]
 
def diffResults(d_old, d_new):
   passes = {}
   removed = ''
 
   for x in ['compile state', 'compile time', 'exec state', 'exec time']:
     regressions[x] = ''
     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':
                 regressions[x] += t + "\n"
             else:
               if d_new[t][x] == 'PASS':
                 passes[x] += t + "\n"
 
           else :
             regressions[x] += t + "\n"
 
         if x == 'compile state' or x == 'exec state':
           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]):
           continue
 
         elif math.isnan(d_old[t][x]) and not math.isnan(d_new[t][x]):
           passes[x] += t + "\n"