[util] Make util/generate_compilation_db.py compatiable with python 3.6
Signed-off-by: Alphan Ulusoy <alphan@google.com>
diff --git a/util/generate_compilation_db.py b/util/generate_compilation_db.py
index 0b14f5c..67abe25 100755
--- a/util/generate_compilation_db.py
+++ b/util/generate_compilation_db.py
@@ -27,9 +27,10 @@
import json
import os
import subprocess
+from typing import Dict, List
-def build_id_lookup_dict(dicts: list[dict]):
+def build_id_lookup_dict(dicts: List[Dict]):
"""Create a dict from `dicts` indexed by the "id" key."""
lookup = {}
for d in dicts:
@@ -63,7 +64,7 @@
return os.path.join(*reversed(labels))
- def iter_artifacts_for_dep_sets(self, dep_set_ids: list[int]):
+ def iter_artifacts_for_dep_sets(self, dep_set_ids: List[int]):
"""Iterate the reconstructed paths of all artifacts related to `dep_set_ids`."""
dep_set_id_stack = dep_set_ids
@@ -85,7 +86,7 @@
class BazelAqueryAction:
"""Corresponds to Bazel's analysis.Action protobuf."""
- def __init__(self, action: dict):
+ def __init__(self, action: Dict):
self.mnemonic = action.get('mnemonic', None)
self.arguments = action.get('arguments', None)
self.input_dep_set_ids = action.get('inputDepSetIds', [])
@@ -103,9 +104,9 @@
args.target,
]
completed_process = subprocess.run(bazel_aquery_command,
- capture_output=True,
- check=True,
- text=True)
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ check=True)
aquery_results = BazelAqueryResults(completed_process.stdout)
compile_commands = []
