[autotest] client: fix json API under Python 3 [chromiumos/third_party/autotest : release-R78-12499.B]

4 views

Skip to first unread message

Commit Bot (Gerrit)

unread,

Apr 8, 2020, 11:38:49 AM4/8/20

to Mike Frysinger, Keith Haddow

Commit Bot submitted this change.

Approvals:
  Keith Haddow: Looks good to me, approved; Commit; Verified

[autotest] client: fix json API under Python 3

Passing a 3rd argument to json.dump under Python 2 doesn't do
anything useful, but Python 3 rejects it.  Drop it entirely.

BUG=chromium:990593
TEST=CQ passes

Change-Id: Ie0b9190ceb351761c06ed3365a0275697d980c53
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1933407
Reviewed-by: Allen Li <aya...@chromium.org>
Commit-Queue: Mike Frysinger <vap...@chromium.org>
Tested-by: Mike Frysinger <vap...@chromium.org>
(cherry picked from commit f1b0066b0e57e272c917873e834f10d35b6b790a)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2142371
Reviewed-by: Keith Haddow <had...@chromium.org>
Commit-Queue: Keith Haddow <had...@chromium.org>
Tested-by: Keith Haddow <had...@chromium.org>
---
M client/common_lib/hosts/base_classes.py
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/common_lib/hosts/base_classes.py b/client/common_lib/hosts/base_classes.py
index df92679..e2be493 100644
--- a/client/common_lib/hosts/base_classes.py
+++ b/client/common_lib/hosts/base_classes.py
@@ -568,7 +568,7 @@
         @return: list of files
         """
         SCRIPT = ("python -c 'import json, glob, sys;"
-                  "json.dump(glob.glob(sys.argv[1]), sys.stdout, 0)'")
+                  "json.dump(glob.glob(sys.argv[1]), sys.stdout)'")
         output = self.run(SCRIPT, args=(glob,), stdout_tee=None,
                           timeout=60).stdout
         return json.loads(output)

To view, visit change 2142371. To unsubscribe, or for help writing mail filters, visit settings.

Reply all

Reply to author

Forward

0 new messages