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, 14 insertions, 14 deletions

diff --git a/setup_chromeos.py b/setup_chromeos.py
index 0b51d830..63206492 100755
--- a/setup_chromeos.py
+++ b/setup_chromeos.py
@@ -1,8 +1,9 @@
-#!/usr/bin/env python2
-#
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 # Copyright 2010 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 checkout the ChromeOS source.
 
 This script sets up the ChromeOS source in the given directory, matching a
@@ -85,7 +86,7 @@ def GetVersionSpecFile(version, versions_git):
 def TimeToCommonVersion(timestamp):
   """Convert timestamp to common image version."""
   tdt = datetime.fromtimestamp(float(timestamp))
-  with open(COMMON_VERSIONS, 'r') as f:
+  with open(COMMON_VERSIONS, 'r', encoding='utf-8') as f:
     common_list = pickle.load(f)
     for sv in common_list:
       sdt = datetime.strptime(sv['date'], '%Y-%m-%d %H:%M:%S.%f')
@@ -157,7 +158,7 @@ Default is 'latest_lkgm'.""")
     if version not in ('lkgm', 'common'):
       parser.print_help()
       logger.GetLogger().LogFatal('timestamp option only applies for '
-                                  "versions \"lkgm\" or \"common\"")
+                                  'versions "lkgm" or "common"')
 
   if not options.directory:
     parser.print_help()
@@ -181,8 +182,8 @@ Default is 'latest_lkgm'.""")
     manifests = manifest_versions.ManifestVersions()
     version = manifests.TimeToVersionChromeOS(time.mktime(time.gmtime()))
     version, manifest = version.split('.', 1)
-    logger.GetLogger().LogOutput('found version %s.%s for latest LKGM' %
-                                 (version, manifest))
+    logger.GetLogger().LogOutput(
+        'found version %s.%s for latest LKGM' % (version, manifest))
     init = ('repo init -u %s -m paladin/buildspecs/%s/%s.xml' %
             (versions_repo, version, manifest))
     del manifests
@@ -193,17 +194,16 @@ Default is 'latest_lkgm'.""")
     manifests = manifest_versions.ManifestVersions()
     version = manifests.TimeToVersion(timestamp)
     version, manifest = version.split('.', 1)
-    logger.GetLogger().LogOutput(
-        'found version %s.%s for LKGM at timestamp %s' % (version, manifest,
-                                                          timestamp))
+    logger.GetLogger().LogOutput('found version %s.%s for LKGM at timestamp %s'
+                                 % (version, manifest, timestamp))
     init = ('repo init -u %s -m paladin/buildspecs/%s/%s.xml' %
             (versions_repo, version, manifest))
     del manifests
   elif version == 'latest_common':
     version = TimeToCommonVersion(time.mktime(time.gmtime()))
     version, manifest = version.split('.', 1)
-    logger.GetLogger().LogOutput('found version %s.%s for latest Common image' %
-                                 (version, manifest))
+    logger.GetLogger().LogOutput(
+        'found version %s.%s for latest Common image' % (version, manifest))
     init = ('repo init -u %s -m buildspecs/%s/%s.xml' % (versions_repo, version,
                                                          manifest))
   elif version == 'common':
@@ -212,9 +212,9 @@ Default is 'latest_lkgm'.""")
       logger.GetLogger().LogFatal('No timestamp specified for version=lkgm')
     version = TimeToCommonVersion(timestamp)
     version, manifest = version.split('.', 1)
-    logger.GetLogger().LogOutput('found version %s.%s for latest common image '
-                                 'at timestamp %s' % (version, manifest,
-                                                      timestamp))
+    logger.GetLogger().LogOutput(
+        'found version %s.%s for latest common image '
+        'at timestamp %s' % (version, manifest, timestamp))
     init = ('repo init -u %s -m buildspecs/%s/%s.xml' % (versions_repo, version,
                                                          manifest))
   else: