tools: fix Python 3 syntax error in mac_tool.py

PR-URL: #30146
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>

Author: cclauss

tools/gyp/pylib/gyp/mac_tool.py

@@ -137,29 +137,25 @@ def _CopyStringsFile(self, source, dest):
 # semicolon in dictionary.
 # on invalid files. Do the same kind of validation.
 importCoreFoundation
-s=open(source, 'rb').read()
+withopen(source, 'rb') asin_file:
+s=in_file.read()
 d=CoreFoundation.CFDataCreate(None, s, len(s))
 _, error=CoreFoundation.CFPropertyListCreateFromXMLData(None, d, 0, None)
 iferror:
 return
 
-fp=open(dest, 'wb')
-fp.write(s.decode(input_code).encode('UTF-16'))
-fp.close()
+withopen(dest, 'wb') asfp:
+fp.write(s.decode(input_code).encode('UTF-16'))
 
 def_DetectInputEncoding(self, file_name):
 """Reads the first few bytes from file_name and tries to guess the text
  encoding. Returns None as a guess if it can't detect it."""
-fp=open(file_name, 'rb')
-try:
-header=fp.read(3)
-exceptException:
-fp.close()
-returnNone
-fp.close()
-ifheader.startswith("\xFE\xFF"):
-return"UTF-16"
-elifheader.startswith("\xFF\xFE"):
+withopen(file_name, 'rb') asfp:
+try:
+header=fp.read(3)
+exceptException:
+returnNone
+ifheader.startswith(("\xFE\xFF", "\xFF\xFE")):
 return"UTF-16"
 elifheader.startswith("\xEF\xBB\xBF"):
 return"UTF-8"
@@ -169,9 +165,8 @@ def _DetectInputEncoding(self, file_name):
 defExecCopyInfoPlist(self, source, dest, convert_to_binary, *keys):
 """Copies the |source| Info.plist to the destination directory |dest|."""
 # Read the source Info.plist into memory.
-fd=open(source, 'r')
-lines=fd.read()
-fd.close()
+withopen(source, 'r') asfd:
+lines=fd.read()
 
 # Insert synthesized key/value pairs (e.g. BuildMachineOSBuild).
 plist=plistlib.readPlistFromString(lines)
@@ -204,17 +199,16 @@ def ExecCopyInfoPlist(self, source, dest, convert_to_binary, *keys):
 lines=string.replace(lines, evar, evalue)
 
 # Remove any keys with values that haven't been replaced.
-lines=lines.split('\n')
+lines=lines.splitlines()
 foriinrange(len(lines)):
 iflines[i].strip().startswith("<string>${"):
 lines[i] =None
 lines[i-1] =None
-lines='\n'.join(filter(lambdax: xisnotNone, lines))
+lines='\n'.join(lineforlineinlinesiflineisnotNone)
 
 # Write out the file with variables replaced.
-fd=open(dest, 'w')
-fd.write(lines)
-fd.close()
+withopen(dest, 'w') asfd:
+fd.write(lines)
 
 # Now write out PkgInfo file now that the Info.plist file has been
 # "compiled".
@@ -242,9 +236,8 @@ def _WritePkgInfo(self, info_plist):
 signature_code='?'*4
 
 dest=os.path.join(os.path.dirname(info_plist), 'PkgInfo')
-fp=open(dest, 'w')
-fp.write('%s%s'% (package_type, signature_code))
-fp.close()
+withopen(dest, 'w') asfp:
+fp.write('%s%s'% (package_type, signature_code))
 
 defExecFlock(self, lockfile, *cmd_list):
 """Emulates the most basic behavior of Linux's flock(1)."""
@@ -295,9 +288,8 @@ def ExecPackageIosFramework(self, framework):
 ' module * { export * }\n' \
 '}\n'% (binary, binary)
 
-module_file=open(os.path.join(module_path, 'module.modulemap'), "w")
-module_file.write(module_template)
-module_file.close()
+withopen(os.path.join(module_path, 'module.modulemap'), "w") asmodule_file:
+module_file.write(module_template)
 
 defExecPackageFramework(self, framework, version):
 """Takes a path to Something.framework and the Current version of that and
@@ -337,7 +329,7 @@ def _Relink(self, dest, link):
 
 defExecCompileIosFrameworkHeaderMap(self, out, framework, *all_headers):
 framework_name=os.path.basename(framework).split('.')[0]
-all_headers=map(os.path.abspath, all_headers)
+all_headers=[os.path.abspath(header) forheaderinall_headers]
 filelist= {}
 forheaderinall_headers:
 filename=os.path.basename(header)
@@ -669,7 +661,7 @@ def WriteHmap(output_name, filelist):
 count=len(filelist)
 capacity=NextGreaterPowerOf2(count)
 strings_offset=24+ (12*capacity)
-max_value_length=len(max(filelist.items(), key=lambda (k,v):len(v))[1])
+max_value_length=max(len(value) forvalueinfilelist.values())
 
 out=open(output_name, "wb")
 out.write(struct.pack('<LHHLLLL', magic, version, _reserved, strings_offset,