Python compat - iteritems() vs. items()

Always use `items()` and introduce extra `list(...)` call when needed.

Differential Revision: https://reviews.llvm.org/D56257

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350312 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/llvm-readobj/Inputs/relocs.py b/test/tools/llvm-readobj/Inputs/relocs.py
index 7c40233ce45b0fd06d561aaf0e99b1975ade988a..8e621cef5cd98ba37cb51a096f53fe915d3d22a0 100644 (file)
--- a/test/tools/llvm-readobj/Inputs/relocs.py
+++ b/test/tools/llvm-readobj/Inputs/relocs.py
@@ -75,7 +75,7 @@ class EnumType(type):
     def makeKey(item):
       return (item[1], item[0])
     e = []
-    for pair in sorted(self._nameMap.iteritems(), key=makeKey):
+    for pair in sorted(self._nameMap.items(), key=makeKey):
       e.append(pair)
     return e
 

diff --git a/utils/Reviewing/find_interesting_reviews.py b/utils/Reviewing/find_interesting_reviews.py
index a9ab3a3ec85e3caca41812652f8ee7b1cf209544..7bfbec8cfde9e5459274fc25dc3140438ef921e5 100644 (file)
--- a/utils/Reviewing/find_interesting_reviews.py
+++ b/utils/Reviewing/find_interesting_reviews.py
@@ -52,10 +52,10 @@ class PhabObjectCache:
         return self.id2PhabObjects[id]
 
     def get_ids_in_cache(self):
-        return self.id2PhabObjects.keys()
+        return list(self.id2PhabObjects.keys())
 
     def get_objects(self):
-        return self.id2PhabObjects.values()
+        return list(self.id2PhabObjects.values())
 
     DEFAULT_DIRECTORY = "PhabObjectCache"
 

diff --git a/utils/docker/scripts/llvm_checksum/llvm_checksum.py b/utils/docker/scripts/llvm_checksum/llvm_checksum.py
index 584efa2598bfdab1e1af768940a0f923d66c11f6..f554d920104f0a92218f213e8b2c718b35b7cdff 100755 (executable)
--- a/utils/docker/scripts/llvm_checksum/llvm_checksum.py
+++ b/utils/docker/scripts/llvm_checksum/llvm_checksum.py
@@ -183,7 +183,7 @@ def ValidateChecksums(reference_checksums,
     if len(new_checksums) != len(reference_checksums):
       return False
 
-  for proj, checksum in new_checksums.iteritems():
+  for proj, checksum in new_checksums.items():
     # We never computed a checksum for this project.
     if proj not in reference_checksums:
       return False