commit d096081a417fc58850fb8aa33bb2c24dbee0fc48
author Mike Frysinger <vapier@chromium.org> Tue Jun 09 01:53:32 2020 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Jun 10 22:47:33 2020 +0000
tree 23da014f2c8c97b552348833ba5385182e51f4e3
parent 281687bc69c7ccfa3e51df2971cf382badd8a719

pformat: convert various json dump logic to new helper

This makes the output consistent for humans & compact.

BUG=None
TEST=unittests pass

Change-Id: Ic2652095fdbe023caf2af11260c50d59bcbc5f0e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2237071
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_extract_deps.py

diff --git a/scripts/cros_extract_deps.py b/scripts/cros_extract_deps.py
index 6aeab8c..cfc5bd4 100644
--- a/scripts/cros_extract_deps.py
+++ b/scripts/cros_extract_deps.py
@@ -11,7 +11,6 @@
 from __future__ import print_function
 from __future__ import absolute_import
 
-import json
 import os
 import sys
 
@@ -21,6 +20,7 @@
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_logging as logging
 from chromite.lib import osutils
+from chromite.lib import pformat
 from chromite.lib import portage_util
 
 
@@ -328,9 +328,5 @@
   sysroot = opts.sysroot or cros_build_lib.GetSysroot(opts.board)
   deps_list, _ = ExtractDeps(sysroot, opts.pkgs, opts.format)
 
-  deps_output = json.dumps(deps_list, sort_keys=True, indent=2)
-  if opts.output_path:
-    with open(opts.output_path, 'w') as f:
-      f.write(deps_output)
-  else:
-    print(deps_output)
+  pformat.json(deps_list,
+               fp=opts.output_path if opts.output_path else sys.stdout)