Reland "yaml: use safe_load"
This is a reland of 86f3706433cf52c04ad1eca2a02d910942ffd4d5
I've examined generated yaml from zork build to ensure the two added
types to the loader are comprehensive.
BUG=None
TEST=forced relevance on CQ + unitests
Original change's description:
> yaml: use safe_load
>
> This silences warnings, might be safer too!
>
> BUG=None
> TEST=cq + units
>
> Change-Id: I2398d05d56f783db931ebaacf48f9c86205fe865
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2903129
> Commit-Queue: George Engelbrecht <engeg@google.com>
> Tested-by: George Engelbrecht <engeg@google.com>
> Reviewed-by: Jack Neus <jackneus@google.com>
> Reviewed-by: LaMont Jones <lamontjones@chromium.org>
> Reviewed-by: Mike Frysinger <vapier@chromium.org>
Bug: None
Change-Id: Ia7e6f343af49d758f4971aa71e1c26dfb3744273
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2906352
Tested-by: George Engelbrecht <engeg@google.com>
Auto-Submit: George Engelbrecht <engeg@google.com>
Commit-Queue: George Engelbrecht <engeg@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/scripts/tricium_clang_tidy.py b/scripts/tricium_clang_tidy.py
index b661369..de99716 100644
--- a/scripts/tricium_clang_tidy.py
+++ b/scripts/tricium_clang_tidy.py
@@ -360,7 +360,7 @@
f'{json_file}. Output:\n{meta.stdstreams}')
with yaml_file.open('rb') as f:
- yaml_data = yaml.load(f)
+ yaml_data = yaml.safe_load(f)
return meta, list(parse_tidy_fixes_file(Path(meta.wd), yaml_data))
except Exception:
return ExceptionData()
@@ -485,8 +485,8 @@
results = set()
# If clang-tidy dumps a lot of diags, it can take 1-10secs of CPU while
- # holding the GIL to |yaml.load| on my otherwise-idle dev box. |yaml_pool|
- # lets us do this in parallel.
+ # holding the GIL to |yaml.safe_load| on my otherwise-idle dev box.
+ # |yaml_pool| lets us do this in parallel.
with multiprocessing.pool.Pool() as yaml_pool:
for ebuild in ebuild_list:
lint_tmpdir = generate_lints(board, ebuild.ebuild_path)