Merging 18 commit(s) from Chromium's toolchain-utils am: 0ae38c8498 am: 2a19d36a82 am: e617e3393dr_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-b-release

Change-Id: I3f25c7ee034b2e20e37ed941b8eae24eec7043eb

1 files changed, 20 insertions, 18 deletions

diff --git a/update_telemetry_defaults.py b/update_telemetry_defaults.py
index 943dc261..c070aeb1 100755
--- a/update_telemetry_defaults.py
+++ b/update_telemetry_defaults.py
@@ -1,6 +1,9 @@
-#!/usr/bin/env python2
-#
-# Copyright 2013 Google Inc. All Rights Reserved.
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
 """Script to maintain the Telemetry benchmark default results file.
 
 This script allows the user to see and update the set of default
@@ -36,20 +39,20 @@ class TelemetryDefaults(object):
 
   def ReadDefaultsFile(self):
     if os.path.exists(self._filename):
-      with open(self._filename, 'r') as fp:
+      with open(self._filename, 'r', encoding='utf-8') as fp:
         self._defaults = json.load(fp)
 
   def WriteDefaultsFile(self):
-    with open(self._filename, 'w') as fp:
+    with open(self._filename, 'w', encoding='utf-8') as fp:
       json.dump(self._defaults, fp, indent=2)
 
-  def ListCurrentDefaults(self, benchmark=all):
+  def ListCurrentDefaults(self, benchmark='all'):
     # Show user current defaults. By default, show all.  The user
     # can specify the name of a particular benchmark to see only that
     # benchmark's default values.
     if len(self._defaults) == 0:
       print('The benchmark default results are currently empty.')
-    if benchmark == all:
+    if benchmark == 'all':
       for b in self._defaults.keys():
         results = self._defaults[b]
         out_str = b + ' : '
@@ -83,8 +86,8 @@ class TelemetryDefaults(object):
         print("Updated results set for '%s': " % benchmark)
         print('%s : %s' % (benchmark, repr(self._defaults[benchmark])))
       else:
-        print("'%s' is not in '%s's default results list." % (result,
-                                                              benchmark))
+        print(
+            "'%s' is not in '%s's default results list." % (result, benchmark))
     else:
       print("Cannot find benchmark named '%s'" % benchmark)
 
@@ -145,14 +148,14 @@ lower) does not matter, for the command (case of the result name DOES matter):
     words = inp.split(' ')
     option = words[0]
     option = option.lower()
-    if option == 'h' or option == 'help':
+    if option in ('h', 'help'):
       self.ShowOptions()
-    elif option == 'l' or option == 'list':
+    elif option in ('l', 'list'):
       if len(words) == 1:
         self.ListCurrentDefaults()
       else:
         self.ListCurrentDefaults(benchmark=words[1])
-    elif option == 'a' or option == 'add':
+    elif option in ('a', 'add'):
       if len(words) < 3:
         self.UsageError(inp)
       else:
@@ -160,31 +163,30 @@ lower) does not matter, for the command (case of the result name DOES matter):
         resultList = words[2:]
         for r in resultList:
           self.AddDefault(benchmark, r)
-    elif option == 'd' or option == 'delete':
+    elif option in ('d', 'delete'):
       if len(words) != 3:
         self.UsageError(inp)
       else:
         benchmark = words[1]
         result = words[2]
         self.RemoveDefault(benchmark, result)
-    elif option == 'r' or option == 'remove':
+    elif option in ('r', 'remove'):
       if len(words) != 2:
         self.UsageError(inp)
       else:
         benchmark = words[1]
         self.RemoveBenchmark(benchmark)
-    elif option == 'm' or option == 'move':
+    elif option in ('m', 'move'):
       if len(words) != 3:
         self.UsageError(inp)
       else:
         old_name = words[1]
         new_name = words[2]
         self.RenameBenchmark(old_name, new_name)
-    elif option == 'q' or option == 'quit':
+    elif option in ('q', 'quit'):
       self.WriteDefaultsFile()
 
-    return (option == 'q' or option == 'quit' or option == 't' or
-            option == 'terminate')
+    return option in ('q', 'quit', 't', 'terminate')
 
 
 def Main():