toolchain-utils: Partially port scripts to python 3

This patch ports some still-in-use python scripts under root directory
of toolchain-utils to python 3.

BUG=chromium:1011676
TEST=Passed unittests and tested with manually launching.

Change-Id: Id6066944780a7204fe4746cd271f41ac20f2274d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2049103
Commit-Queue: Zhizhou Yang <zhizhouy@google.com>
Tested-by: Zhizhou Yang <zhizhouy@google.com>
Auto-Submit: Zhizhou Yang <zhizhouy@google.com>
Reviewed-by: George Burgess <gbiv@chromium.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py
index be18d467..5f7c21d3 100755
--- a/buildbot_test_toolchains.py
+++ b/buildbot_test_toolchains.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Copyright 2016 The Chromium OS Authors. All rights reserved.
@@ -195,7 +195,7 @@ class ToolchainComparator(object):
     }
     """
 
-    with open(experiment_file, 'w') as f:
+    with open(experiment_file, 'w', encoding='utf-8') as f:
       f.write(experiment_header)
       f.write(experiment_tests)
 
@@ -251,11 +251,10 @@ class ToolchainComparator(object):
     ret = self._ce.RunCommand(command)
     if ret != 0:
       raise RuntimeError('Crosperf execution error!')
-    else:
-      # Copy json report to pending archives directory.
-      command = 'cp %s/*.json %s/.' % (self._reports_dir, PENDING_ARCHIVES_DIR)
-      ret = self._ce.RunCommand(command)
-    return
+
+    # Copy json report to pending archives directory.
+    command = 'cp %s/*.json %s/.' % (self._reports_dir, PENDING_ARCHIVES_DIR)
+    ret = self._ce.RunCommand(command)
 
   def _SendEmail(self):
     """Find email message generated by crosperf and send it."""