Fix build/mac_toolchain.py for pylint warning.

build/mac_toolchain.py

 #!/usr/bin/env python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Download necessary mac toolchain files under certain conditions.  If
 xcode-select is already set and points to an external folder
 (e.g. /Application/Xcode.app), this script only runs if the GYP_DEFINE
 |force_mac_toolchain| is set.  To override the values in
 |TOOLCHAIN_REVISION|-|TOOLCHAIN_SUB_REVISION| below, GYP_DEFINE
@@ skipping 91 matching lines @@
   """Loads Plist at |path| and returns it as a dictionary."""
   fd, name = tempfile.mkstemp()
   try:
     subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path])
     with os.fdopen(fd, 'r') as f:
       return plistlib.readPlist(f)
   finally:
     os.unlink(name)
 
 
-def AcceptLicense(directory):

[justincohen, 2016/05/11 13:52:21]

and remove this.

+def AcceptLicense():
   """Use xcodebuild to accept new toolchain license if necessary.  Don't accept
   the license if a newer license has already been accepted. This only works if
   xcodebuild and xcode-select are passwordless in sudoers."""
 
   # Check old license
   try:
     target_license_plist_path = \
         os.path.join(TOOLCHAIN_BUILD_DIR,
                      *['Contents','Resources','LicenseInfo.plist'])
     target_license_plist = LoadPlist(target_license_plist_path)
     build_type = target_license_plist['licenseType']
     build_version = target_license_plist['licenseID']
 
     accepted_license_plist = LoadPlist(
         '/Library/Preferences/com.apple.dt.Xcode.plist')
     agreed_to_key = 'IDELast%sLicenseAgreedTo' % build_type
     last_license_agreed_to = accepted_license_plist[agreed_to_key]
 
     # Historically all Xcode build numbers have been in the format of AANNNN, so
     # a simple string compare works.  If Xcode's build numbers change this may
     # need a more complex compare.
     if build_version <= last_license_agreed_to:
       # Don't accept the license of older toolchain builds, this will break the
       # license of newer builds.
       return
-  except (subprocess.CalledProcessError, KeyError) as e:
+  except (subprocess.CalledProcessError, KeyError):
     # If there's never been a license of type |build_type| accepted,
     # |target_license_plist_path| or |agreed_to_key| may not exist.
     pass
 
   print "Accepting license."
   old_path = subprocess.Popen(['/usr/bin/xcode-select', '-p'],
                                stdout=subprocess.PIPE).communicate()[0].strip()
   try:
     build_dir = os.path.join(TOOLCHAIN_BUILD_DIR, 'Contents/Developer')
     subprocess.check_call(['sudo', '/usr/bin/xcode-select', '-s', build_dir])
@@ skipping 20 matching lines @@
 
   # TODO(justincohen): Add support for GN per crbug.com/570091
   if UseLocalMacSDK():
     print 'Using local toolchain.'
     return 0
 
   toolchain_revision = os.environ.get('MAC_TOOLCHAIN_REVISION',
                                       TOOLCHAIN_VERSION)
   if ReadStampFile() == toolchain_revision:
     print 'Toolchain (%s) is already up to date.' % toolchain_revision
     AcceptLicense(TOOLCHAIN_BUILD_DIR)

[justincohen, 2016/05/11 13:52:21]

probably makes more sense to remove the param.

[tikuta, 2016/05/12 02:02:33]

Done.

     return 0
 
   if not CanAccessToolchainBucket():
     print 'Cannot access toolchain bucket.'
     return 0
 
   # Reset the stamp file in case the build is unsuccessful.
   WriteStampFile('')
 
   toolchain_file = '%s.tgz' % toolchain_revision
   toolchain_full_url = TOOLCHAIN_URL + toolchain_file
 
   print 'Updating toolchain to %s...' % toolchain_revision
   try:
     toolchain_file = 'toolchain-%s.tgz' % toolchain_revision
     toolchain_full_url = TOOLCHAIN_URL + toolchain_file
     DownloadAndUnpack(toolchain_full_url, TOOLCHAIN_BUILD_DIR)
     AcceptLicense(TOOLCHAIN_BUILD_DIR)

[justincohen, 2016/05/11 13:52:21]

and here

[tikuta, 2016/05/12 02:02:33]

Done.

 
     print 'Toolchain %s unpacked.' % toolchain_revision
     WriteStampFile(toolchain_revision)
     return 0
-  except:
+  except Exception as e:
     print 'Failed to download toolchain %s.' % toolchain_file
+    print 'Exception %s' % e
     print 'Exiting.'
     return 1
 
 if __name__ == '__main__':
   sys.exit(main())