aboutsummaryrefslogtreecommitdiff
path: root/modules/llvm.py
diff options
context:
space:
mode:
Diffstat (limited to 'modules/llvm.py')
-rw-r--r--modules/llvm.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/llvm.py b/modules/llvm.py
index 8922c83..34cd02c 100644
--- a/modules/llvm.py
+++ b/modules/llvm.py
@@ -135,12 +135,12 @@ class LLVMSourceConfig(object):
if remove is None:
remove = []
- for subproj in add.keys():
+ for subproj in list(add.keys()):
if subproj in remove:
raise ValueError("Can't add and remove {} at the same time"
.format(subproj))
- for (subproj, repo) in add.items():
+ for (subproj, repo) in list(add.items()):
self.__add_subproject(subproj, repo)
for subproj in remove:
@@ -148,7 +148,7 @@ class LLVMSourceConfig(object):
def __get_subproj_object(self, subprojName):
"""Get the LLVMSubproject object corresponding to subprojName."""
- if not subprojName in self.subprojs.keys():
+ if not subprojName in list(self.subprojs.keys()):
raise ValueError("Unknown llvm subproject {0}".format(subprojName))
return self.subprojs[subprojName]
@@ -202,7 +202,7 @@ class LLVMSourceConfig(object):
# Create a new worktree
branch = self.llvmSourceTree.getbranch()
- if subprojRepo.branchexists(branch):
+ if subprojRepo.branch_exists(branch):
Worktree.create(self.proj, subprojRepo, path, branch)
else:
trackedBranch = "master" # TODO: track proper branch