build: more Python 3 compat, replace compile with ast

Make Python 3 compatiblity changes so the code works in both Python 2
and Python 3. Especially, make changes required because the compiler
module was removed in Python 3 in favor of the ast module that exists
in both Python 2 and Python 3.
PR-URL: #1820
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Rod Vagg <r@va.gg>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>

Author: cclauss

gyp/pylib/gyp/generator/analyzer.py

@@ -671,7 +671,7 @@ def find_matching_compile_target_names(self):
 assertself.is_build_impacted();
 # Compile targets are found by searching up from changed targets.
 # Reset the visited status for _GetBuildTargets.
-fortargetinself._name_to_target.itervalues():
+fortargetinself._name_to_target.values():
 target.visited=False
 
 supplied_targets=_LookupTargets(self._supplied_target_names_no_all(),

gyp/pylib/gyp/generator/eclipse.py

@@ -272,7 +272,7 @@ def WriteMacros(out, eclipse_langs, defines):
 out.write(' <language name="holder for library settings"></language>\n')
 forlangineclipse_langs:
 out.write(' <language name="%s">\n'%lang)
-forkeyinsorted(defines.iterkeys()):
+forkeyinsorted(defines):
 out.write(' <macro><name>%s</name><value>%s</value></macro>\n'%
  (escape(key), escape(defines[key])))
 out.write(' </language>\n')

gyp/pylib/gyp/generator/make.py

@@ -821,7 +821,7 @@ def Write(self, qualified_target, base_path, output_filename, spec, configs,
 gyp.xcode_emulation.MacPrefixHeader(
 self.xcode_settings, lambdap: Sourceify(self.Absolutify(p)),
 self.Pchify))
-sources=filter(Compilable, all_sources)
+sources=list(filter(Compilable, all_sources))
 ifsources:
 self.WriteLn(SHARED_HEADER_SUFFIX_RULES_COMMENT1)
 extensions=set([os.path.splitext(s)[1] forsinsources])
@@ -950,7 +950,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 '%s%s'
 % (name, cd_action, command))
 self.WriteLn()
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 # The makefile rules are all relative to the top dir, but the gyp actions
 # are defined relative to their containing dir. This replaces the obj
 # variable for the action rule with an absolute version so that the output
@@ -974,7 +974,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-self.WriteDoCmd(outputs, map(Sourceify, map(self.Absolutify, inputs)),
+self.WriteDoCmd(outputs, [Sourceify(self.Absolutify(i)) foriininputs],
 part_of_all=part_of_all, command=name)
 
 # Stuff the outputs in a variable so we can refer to them later.
@@ -1023,8 +1023,8 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 extra_sources+=outputs
 ifint(rule.get('process_outputs_as_mac_bundle_resources', False)):
 extra_mac_bundle_resources+=outputs
-inputs=map(Sourceify, map(self.Absolutify, [rule_source] +
-rule.get('inputs', [])))
+inputs=[Sourceify(self.Absolutify(i)) fori
+in [rule_source] +rule.get('inputs', [])]
 actions= ['$(call do_cmd,%s_%d)'% (name, count)]
 
 ifname=='resources_grit':
@@ -1040,7 +1040,7 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 all_outputs+=outputs
 # Only write the 'obj' and 'builddir' rules for the "primary" output
 # (:1); it's superfluous for the "extra outputs", and this avoids
@@ -1147,7 +1147,7 @@ def WriteCopies(self, copies, extra_outputs, part_of_all):
 path=gyp.xcode_emulation.ExpandEnvVars(path, env)
 self.WriteDoCmd([output], [path], 'copy', part_of_all)
 outputs.append(output)
-self.WriteLn('%s = %s'% (variable, ' '.join(map(QuoteSpaces, outputs))))
+self.WriteLn('%s = %s'% (variable, ' '.join(QuoteSpaces(o) foroinoutputs)))
 extra_outputs.append('$(%s)'%variable)
 self.WriteLn()
 
@@ -1158,7 +1158,7 @@ def WriteMacBundleResources(self, resources, bundle_deps):
 
 foroutput, resingyp.xcode_emulation.GetMacBundleResources(
 generator_default_variables['PRODUCT_DIR'], self.xcode_settings,
-map(Sourceify, map(self.Absolutify, resources))):
+[Sourceify(self.Absolutify(r)) forrinresources]):
 _, ext=os.path.splitext(output)
 ifext!='.xcassets':
 # Make does not supports '.xcassets' emulation.
@@ -1238,11 +1238,11 @@ def WriteSources(self, configs, deps, sources,
 self.WriteList(cflags_objcc, 'CFLAGS_OBJCC_%s'%configname)
 includes=config.get('include_dirs')
 ifincludes:
-includes=map(Sourceify, map(self.Absolutify, includes))
+includes=[Sourceify(self.Absolutify(i)) foriinincludes]
 self.WriteList(includes, 'INCS_%s'%configname, prefix='-I')
 
-compilable=filter(Compilable, sources)
-objs=map(self.Objectify, map(self.Absolutify, map(Target, compilable)))
+compilable=list(filter(Compilable, sources))
+objs=[self.Objectify(self.Absolutify(Target(c)))forcincompilable]
 self.WriteList(objs, 'OBJS')
 
 forobjinobjs:
@@ -1314,7 +1314,7 @@ def WriteSources(self, configs, deps, sources,
 
 # If there are any object files in our input file list, link them into our
 # output.
-extra_link_deps+=filter(Linkable, sources)
+extra_link_deps+=list(filter(Linkable, sources))
 
 self.WriteLn()
 
@@ -1564,7 +1564,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 
 # Bundle dependencies. Note that the code below adds actions to this
 # target, so if you move these two lines, move the lines below as well.
-self.WriteList(map(QuoteSpaces, bundle_deps), 'BUNDLE_DEPS')
+self.WriteList([QuoteSpaces(dep) fordepinbundle_deps], 'BUNDLE_DEPS')
 self.WriteLn('%s: $(BUNDLE_DEPS)'%QuoteSpaces(self.output))
 
 # After the framework is built, package it. Needs to happen before
@@ -1598,7 +1598,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 ifself.type=='executable':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 ifself.toolset=='host'andself.flavor=='android':
 self.WriteDoCmd([self.output_binary], link_deps, 'link_host',
 part_of_all, postbuilds=postbuilds)
@@ -1620,7 +1620,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 elifself.type=='shared_library':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 self.WriteDoCmd([self.output_binary], link_deps, 'solink', part_of_all,
 postbuilds=postbuilds)
 elifself.type=='loadable_module':
@@ -1746,8 +1746,8 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
  output is just a name to run the rule
  command: (optional) command name to generate unambiguous labels
  """
-outputs=map(QuoteSpaces, outputs)
-inputs=map(QuoteSpaces, inputs)
+outputs=[QuoteSpaces(o) foroinoutputs]
+inputs=[QuoteSpaces(i) foriininputs]
 
 ifcomment:
 self.WriteLn('# '+comment)
@@ -1836,7 +1836,7 @@ def WriteAndroidNdkModuleRule(self, module_name, all_sources, link_deps):
 default_cpp_ext=ext
 self.WriteLn('LOCAL_CPP_EXTENSION := '+default_cpp_ext)
 
-self.WriteList(map(self.Absolutify, filter(Compilable, all_sources)),
+self.WriteList(list(map(self.Absolutify, filter(Compilable, all_sources))),
 'LOCAL_SRC_FILES')
 
 # Filter out those which do not match prefix and suffix and produce
@@ -1979,7 +1979,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name,
 "%(makefile_name)s: %(deps)s\n"
 "\t$(call do_cmd,regen_makefile)\n\n"% {
 'makefile_name': makefile_name,
-'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)),
+'deps': ' '.join(SourceifyAndQuoteSpaces(bf) forbfinbuild_files),
 'cmd': gyp.common.EncodePOSIXShellList(
  [gyp_binary, '-fmake'] +
 gyp.RegenerateFlags(options) +

gyp/pylib/gyp/generator/msvs.py

@@ -2691,7 +2691,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 platform_name=None
 msvs_windows_target_platform_version=None
-forconfigurationinspec['configurations'].itervalues():
+forconfigurationinspec['configurations'].values():
 platform_name=platform_nameor_ConfigPlatform(configuration)
 msvs_windows_target_platform_version= \
 msvs_windows_target_platform_versionor \
@@ -3252,7 +3252,7 @@ def _GetMSBuildProjectReferences(project):
  ['Project', guid],
  ['ReferenceOutputAssembly', 'false']
  ]
-forconfigindependency.spec.get('configurations', {}).itervalues():
+forconfigindependency.spec.get('configurations', {}).values():
 ifconfig.get('msvs_use_library_dependency_inputs', 0):
 project_ref.append(['UseLibraryDependencyInputs', 'true'])
 break
@@ -3321,7 +3321,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
 extension_to_rule_name, _GetUniquePlatforms(spec))
 missing_sources=_VerifySourcesExist(sources, project_dir)
 
-forconfigurationinconfigurations.itervalues():
+forconfigurationinconfigurations.values():
 _FinalizeMSBuildSettings(spec, configuration)
 
 # Add attributes to root element

gyp/pylib/gyp/input.py

@@ -4,14 +4,8 @@
 
 from __future__ importprint_function
 
-fromcompiler.astimportConst
-fromcompiler.astimportDict
-fromcompiler.astimportDiscard
-fromcompiler.astimportList
-fromcompiler.astimportModule
-fromcompiler.astimportNode
-fromcompiler.astimportStmt
-importcompiler
+importast
+
 importgyp.common
 importgyp.simple_copy
 importmultiprocessing
@@ -184,43 +178,39 @@ def CheckedEval(file_contents):
  Note that this is slower than eval() is.
  """
 
-ast=compiler.parse(file_contents)
-assertisinstance(ast, Module)
-c1=ast.getChildren()
-assertc1[0] isNone
-assertisinstance(c1[1], Stmt)
-c2=c1[1].getChildren()
-assertisinstance(c2[0], Discard)
-c3=c2[0].getChildren()
-assertlen(c3) ==1
-returnCheckNode(c3[0], [])
+syntax_tree=ast.parse(file_contents)
+assertisinstance(syntax_tree, ast.Module)
+c1=syntax_tree.body
+assertlen(c1) ==1
+c2=c1[0]
+assertisinstance(c2, ast.Expr)
+returnCheckNode(c2.value, [])
 
 
 defCheckNode(node, keypath):
-ifisinstance(node, Dict):
+ifisinstance(node, ast.Dict):
 c=node.getChildren()
 dict= {}
-forninrange(0, len(c), 2):
-assertisinstance(c[n], Const)
-key=c[n].getChildren()[0]
+forkey, valueinzip(node.keys, node.values):
+assertisinstance(key, ast.Str)
+key=key.s
 ifkeyindict:
 raiseGypError("Key '"+key+"' repeated at level "+
 repr(len(keypath) +1) +" with key path '"+
 '.'.join(keypath) +"'")
 kp=list(keypath) # Make a copy of the list for descending this node.
 kp.append(key)
-dict[key] =CheckNode(c[n+1], kp)
+dict[key] =CheckNode(value, kp)
 returndict
-elifisinstance(node, List):
-c=node.getChildren()
+elifisinstance(node, ast.List):
 children= []
-forindex, childinenumerate(c):
+forindex, childinenumerate(node.elts):
 kp=list(keypath) # Copy list.
 kp.append(repr(index))
 children.append(CheckNode(child, kp))
 returnchildren
-elifisinstance(node, Const):
-returnnode.getChildren()[0]
+elifisinstance(node, ast.Str):
+returnnode.s
 else:
 raiseTypeError("Unknown AST node at key path '"+'.'.join(keypath) +
 "': "+repr(node))
@@ -954,8 +944,12 @@ def ExpandVariables(input, phase, variables, build_file):
 else:
 replacement=variables[contents]
 
+ifisinstance(replacement, bytes) andnotisinstance(replacement, str):
+replacement=replacement.decode("utf-8") # done on Python 3 only
 iftype(replacement) islist:
 foriteminreplacement:
+ifisinstance(item, bytes) andnotisinstance(item, str):
+item=item.decode("utf-8") # done on Python 3 only
 ifnotcontents[-1] =='/'andtype(item) notin (str, int):
 raiseGypError('Variable '+contents+
 ' must expand to a string or list of strings; '+
@@ -1847,7 +1841,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 # Create a DependencyGraphNode for each gyp file containing a target. Put
 # it into a dict for easy access.
 dependency_nodes= {}
-fortargetintargets.iterkeys():
+fortargetintargets:
 build_file=gyp.common.BuildFile(target)
 ifnotbuild_fileindependency_nodes:
 dependency_nodes[build_file] =DependencyGraphNode(build_file)
@@ -1878,7 +1872,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 
 # Files that have no dependencies are treated as dependent on root_node.
 root_node=DependencyGraphNode(None)
-forbuild_file_nodeindependency_nodes.itervalues():
+forbuild_file_nodeindependency_nodes.values():
 iflen(build_file_node.dependencies) ==0:
 build_file_node.dependencies.append(root_node)
 root_node.dependents.append(build_file_node)

gyp/pylib/gyp/xcode_emulation.py

@@ -1636,7 +1636,7 @@ def _HasIOSTarget(targets):
 def_AddIOSDeviceConfigurations(targets):
 """Clone all targets and append -iphoneos to the name. Configure these targets
  to build for iOS devices and use correct architectures for those builds."""
-fortarget_dictintargets.itervalues():
+fortarget_dictintargets.values():
 toolset=target_dict['toolset']
 configs=target_dict['configurations']
 forconfig_name, config_dictindict(configs).items():

gyp/pylib/gyp/xcode_ninja.py

@@ -85,7 +85,7 @@ def _TargetFromSpec(old_spec, params):
 "%s/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"%ninja_toplevel
 
 if'configurations'inold_spec:
-forconfiginold_spec['configurations'].iterkeys():
+forconfiginold_spec['configurations']:
 old_xcode_settings= \
 old_spec['configurations'][config].get('xcode_settings', {})
 if'IPHONEOS_DEPLOYMENT_TARGET'inold_xcode_settings:

gyp/pylib/gyp/generator/analyzer.py

@@ -671,7 +671,7 @@ def find_matching_compile_target_names(self):
 assertself.is_build_impacted();
 # Compile targets are found by searching up from changed targets.
 # Reset the visited status for _GetBuildTargets.
-fortargetinself._name_to_target.itervalues():
+fortargetinself._name_to_target.values():
 target.visited=False
 
 supplied_targets=_LookupTargets(self._supplied_target_names_no_all(),

gyp/pylib/gyp/generator/eclipse.py

@@ -272,7 +272,7 @@ def WriteMacros(out, eclipse_langs, defines):
 out.write(' <language name="holder for library settings"></language>\n')
 forlangineclipse_langs:
 out.write(' <language name="%s">\n'%lang)
-forkeyinsorted(defines.iterkeys()):
+forkeyinsorted(defines):
 out.write(' <macro><name>%s</name><value>%s</value></macro>\n'%
  (escape(key), escape(defines[key])))
 out.write(' </language>\n')

gyp/pylib/gyp/generator/make.py

@@ -821,7 +821,7 @@ def Write(self, qualified_target, base_path, output_filename, spec, configs,
 gyp.xcode_emulation.MacPrefixHeader(
 self.xcode_settings, lambdap: Sourceify(self.Absolutify(p)),
 self.Pchify))
-sources=filter(Compilable, all_sources)
+sources=list(filter(Compilable, all_sources))
 ifsources:
 self.WriteLn(SHARED_HEADER_SUFFIX_RULES_COMMENT1)
 extensions=set([os.path.splitext(s)[1] forsinsources])
@@ -950,7 +950,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 '%s%s'
 % (name, cd_action, command))
 self.WriteLn()
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 # The makefile rules are all relative to the top dir, but the gyp actions
 # are defined relative to their containing dir. This replaces the obj
 # variable for the action rule with an absolute version so that the output
@@ -974,7 +974,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-self.WriteDoCmd(outputs, map(Sourceify, map(self.Absolutify, inputs)),
+self.WriteDoCmd(outputs, [Sourceify(self.Absolutify(i)) foriininputs],
 part_of_all=part_of_all, command=name)
 
 # Stuff the outputs in a variable so we can refer to them later.
@@ -1023,8 +1023,8 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 extra_sources+=outputs
 ifint(rule.get('process_outputs_as_mac_bundle_resources', False)):
 extra_mac_bundle_resources+=outputs
-inputs=map(Sourceify, map(self.Absolutify, [rule_source] +
-rule.get('inputs', [])))
+inputs=[Sourceify(self.Absolutify(i)) fori
+in [rule_source] +rule.get('inputs', [])]
 actions= ['$(call do_cmd,%s_%d)'% (name, count)]
 
 ifname=='resources_grit':
@@ -1040,7 +1040,7 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 all_outputs+=outputs
 # Only write the 'obj' and 'builddir' rules for the "primary" output
 # (:1); it's superfluous for the "extra outputs", and this avoids
@@ -1147,7 +1147,7 @@ def WriteCopies(self, copies, extra_outputs, part_of_all):
 path=gyp.xcode_emulation.ExpandEnvVars(path, env)
 self.WriteDoCmd([output], [path], 'copy', part_of_all)
 outputs.append(output)
-self.WriteLn('%s = %s'% (variable, ' '.join(map(QuoteSpaces, outputs))))
+self.WriteLn('%s = %s'% (variable, ' '.join(QuoteSpaces(o) foroinoutputs)))
 extra_outputs.append('$(%s)'%variable)
 self.WriteLn()
 
@@ -1158,7 +1158,7 @@ def WriteMacBundleResources(self, resources, bundle_deps):
 
 foroutput, resingyp.xcode_emulation.GetMacBundleResources(
 generator_default_variables['PRODUCT_DIR'], self.xcode_settings,
-map(Sourceify, map(self.Absolutify, resources))):
+[Sourceify(self.Absolutify(r)) forrinresources]):
 _, ext=os.path.splitext(output)
 ifext!='.xcassets':
 # Make does not supports '.xcassets' emulation.
@@ -1238,11 +1238,11 @@ def WriteSources(self, configs, deps, sources,
 self.WriteList(cflags_objcc, 'CFLAGS_OBJCC_%s'%configname)
 includes=config.get('include_dirs')
 ifincludes:
-includes=map(Sourceify, map(self.Absolutify, includes))
+includes=[Sourceify(self.Absolutify(i)) foriinincludes]
 self.WriteList(includes, 'INCS_%s'%configname, prefix='-I')
 
-compilable=filter(Compilable, sources)
-objs=map(self.Objectify, map(self.Absolutify, map(Target, compilable)))
+compilable=list(filter(Compilable, sources))
+objs=[self.Objectify(self.Absolutify(Target(c)))forcincompilable]
 self.WriteList(objs, 'OBJS')
 
 forobjinobjs:
@@ -1314,7 +1314,7 @@ def WriteSources(self, configs, deps, sources,
 
 # If there are any object files in our input file list, link them into our
 # output.
-extra_link_deps+=filter(Linkable, sources)
+extra_link_deps+=list(filter(Linkable, sources))
 
 self.WriteLn()
 
@@ -1564,7 +1564,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 
 # Bundle dependencies. Note that the code below adds actions to this
 # target, so if you move these two lines, move the lines below as well.
-self.WriteList(map(QuoteSpaces, bundle_deps), 'BUNDLE_DEPS')
+self.WriteList([QuoteSpaces(dep) fordepinbundle_deps], 'BUNDLE_DEPS')
 self.WriteLn('%s: $(BUNDLE_DEPS)'%QuoteSpaces(self.output))
 
 # After the framework is built, package it. Needs to happen before
@@ -1598,7 +1598,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 ifself.type=='executable':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 ifself.toolset=='host'andself.flavor=='android':
 self.WriteDoCmd([self.output_binary], link_deps, 'link_host',
 part_of_all, postbuilds=postbuilds)
@@ -1620,7 +1620,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 elifself.type=='shared_library':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 self.WriteDoCmd([self.output_binary], link_deps, 'solink', part_of_all,
 postbuilds=postbuilds)
 elifself.type=='loadable_module':
@@ -1746,8 +1746,8 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
  output is just a name to run the rule
  command: (optional) command name to generate unambiguous labels
  """
-outputs=map(QuoteSpaces, outputs)
-inputs=map(QuoteSpaces, inputs)
+outputs=[QuoteSpaces(o) foroinoutputs]
+inputs=[QuoteSpaces(i) foriininputs]
 
 ifcomment:
 self.WriteLn('# '+comment)
@@ -1836,7 +1836,7 @@ def WriteAndroidNdkModuleRule(self, module_name, all_sources, link_deps):
 default_cpp_ext=ext
 self.WriteLn('LOCAL_CPP_EXTENSION := '+default_cpp_ext)
 
-self.WriteList(map(self.Absolutify, filter(Compilable, all_sources)),
+self.WriteList(list(map(self.Absolutify, filter(Compilable, all_sources))),
 'LOCAL_SRC_FILES')
 
 # Filter out those which do not match prefix and suffix and produce
@@ -1979,7 +1979,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name,
 "%(makefile_name)s: %(deps)s\n"
 "\t$(call do_cmd,regen_makefile)\n\n"% {
 'makefile_name': makefile_name,
-'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)),
+'deps': ' '.join(SourceifyAndQuoteSpaces(bf) forbfinbuild_files),
 'cmd': gyp.common.EncodePOSIXShellList(
  [gyp_binary, '-fmake'] +
 gyp.RegenerateFlags(options) +

gyp/pylib/gyp/generator/msvs.py

@@ -2691,7 +2691,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 platform_name=None
 msvs_windows_target_platform_version=None
-forconfigurationinspec['configurations'].itervalues():
+forconfigurationinspec['configurations'].values():
 platform_name=platform_nameor_ConfigPlatform(configuration)
 msvs_windows_target_platform_version= \
 msvs_windows_target_platform_versionor \
@@ -3252,7 +3252,7 @@ def _GetMSBuildProjectReferences(project):
  ['Project', guid],
  ['ReferenceOutputAssembly', 'false']
  ]
-forconfigindependency.spec.get('configurations', {}).itervalues():
+forconfigindependency.spec.get('configurations', {}).values():
 ifconfig.get('msvs_use_library_dependency_inputs', 0):
 project_ref.append(['UseLibraryDependencyInputs', 'true'])
 break
@@ -3321,7 +3321,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
 extension_to_rule_name, _GetUniquePlatforms(spec))
 missing_sources=_VerifySourcesExist(sources, project_dir)
 
-forconfigurationinconfigurations.itervalues():
+forconfigurationinconfigurations.values():
 _FinalizeMSBuildSettings(spec, configuration)
 
 # Add attributes to root element

gyp/pylib/gyp/input.py

@@ -4,14 +4,8 @@
 
 from __future__ importprint_function
 
-fromcompiler.astimportConst
-fromcompiler.astimportDict
-fromcompiler.astimportDiscard
-fromcompiler.astimportList
-fromcompiler.astimportModule
-fromcompiler.astimportNode
-fromcompiler.astimportStmt
-importcompiler
+importast
+
 importgyp.common
 importgyp.simple_copy
 importmultiprocessing
@@ -184,43 +178,39 @@ def CheckedEval(file_contents):
  Note that this is slower than eval() is.
  """
 
-ast=compiler.parse(file_contents)
-assertisinstance(ast, Module)
-c1=ast.getChildren()
-assertc1[0] isNone
-assertisinstance(c1[1], Stmt)
-c2=c1[1].getChildren()
-assertisinstance(c2[0], Discard)
-c3=c2[0].getChildren()
-assertlen(c3) ==1
-returnCheckNode(c3[0], [])
+syntax_tree=ast.parse(file_contents)
+assertisinstance(syntax_tree, ast.Module)
+c1=syntax_tree.body
+assertlen(c1) ==1
+c2=c1[0]
+assertisinstance(c2, ast.Expr)
+returnCheckNode(c2.value, [])
 
 
 defCheckNode(node, keypath):
-ifisinstance(node, Dict):
+ifisinstance(node, ast.Dict):
 c=node.getChildren()
 dict= {}
-forninrange(0, len(c), 2):
-assertisinstance(c[n], Const)
-key=c[n].getChildren()[0]
+forkey, valueinzip(node.keys, node.values):
+assertisinstance(key, ast.Str)
+key=key.s
 ifkeyindict:
 raiseGypError("Key '"+key+"' repeated at level "+
 repr(len(keypath) +1) +" with key path '"+
 '.'.join(keypath) +"'")
 kp=list(keypath) # Make a copy of the list for descending this node.
 kp.append(key)
-dict[key] =CheckNode(c[n+1], kp)
+dict[key] =CheckNode(value, kp)
 returndict
-elifisinstance(node, List):
-c=node.getChildren()
+elifisinstance(node, ast.List):
 children= []
-forindex, childinenumerate(c):
+forindex, childinenumerate(node.elts):
 kp=list(keypath) # Copy list.
 kp.append(repr(index))
 children.append(CheckNode(child, kp))
 returnchildren
-elifisinstance(node, Const):
-returnnode.getChildren()[0]
+elifisinstance(node, ast.Str):
+returnnode.s
 else:
 raiseTypeError("Unknown AST node at key path '"+'.'.join(keypath) +
 "': "+repr(node))
@@ -954,8 +944,12 @@ def ExpandVariables(input, phase, variables, build_file):
 else:
 replacement=variables[contents]
 
+ifisinstance(replacement, bytes) andnotisinstance(replacement, str):
+replacement=replacement.decode("utf-8") # done on Python 3 only
 iftype(replacement) islist:
 foriteminreplacement:
+ifisinstance(item, bytes) andnotisinstance(item, str):
+item=item.decode("utf-8") # done on Python 3 only
 ifnotcontents[-1] =='/'andtype(item) notin (str, int):
 raiseGypError('Variable '+contents+
 ' must expand to a string or list of strings; '+
@@ -1847,7 +1841,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 # Create a DependencyGraphNode for each gyp file containing a target. Put
 # it into a dict for easy access.
 dependency_nodes= {}
-fortargetintargets.iterkeys():
+fortargetintargets:
 build_file=gyp.common.BuildFile(target)
 ifnotbuild_fileindependency_nodes:
 dependency_nodes[build_file] =DependencyGraphNode(build_file)
@@ -1878,7 +1872,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 
 # Files that have no dependencies are treated as dependent on root_node.
 root_node=DependencyGraphNode(None)
-forbuild_file_nodeindependency_nodes.itervalues():
+forbuild_file_nodeindependency_nodes.values():
 iflen(build_file_node.dependencies) ==0:
 build_file_node.dependencies.append(root_node)
 root_node.dependents.append(build_file_node)

gyp/pylib/gyp/xcode_emulation.py

@@ -1636,7 +1636,7 @@ def _HasIOSTarget(targets):
 def_AddIOSDeviceConfigurations(targets):
 """Clone all targets and append -iphoneos to the name. Configure these targets
  to build for iOS devices and use correct architectures for those builds."""
-fortarget_dictintargets.itervalues():
+fortarget_dictintargets.values():
 toolset=target_dict['toolset']
 configs=target_dict['configurations']
 forconfig_name, config_dictindict(configs).items():

gyp/pylib/gyp/xcode_ninja.py

@@ -85,7 +85,7 @@ def _TargetFromSpec(old_spec, params):
 "%s/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"%ninja_toplevel
 
 if'configurations'inold_spec:
-forconfiginold_spec['configurations'].iterkeys():
+forconfiginold_spec['configurations']:
 old_xcode_settings= \
 old_spec['configurations'][config].get('xcode_settings', {})
 if'IPHONEOS_DEPLOYMENT_TARGET'inold_xcode_settings:

gyp/pylib/gyp/generator/analyzer.py

@@ -671,7 +671,7 @@ def find_matching_compile_target_names(self):
 assertself.is_build_impacted();
 # Compile targets are found by searching up from changed targets.
 # Reset the visited status for _GetBuildTargets.
-fortargetinself._name_to_target.itervalues():
+fortargetinself._name_to_target.values():
 target.visited=False
 
 supplied_targets=_LookupTargets(self._supplied_target_names_no_all(),

gyp/pylib/gyp/generator/eclipse.py

@@ -272,7 +272,7 @@ def WriteMacros(out, eclipse_langs, defines):
 out.write(' <language name="holder for library settings"></language>\n')
 forlangineclipse_langs:
 out.write(' <language name="%s">\n'%lang)
-forkeyinsorted(defines.iterkeys()):
+forkeyinsorted(defines):
 out.write(' <macro><name>%s</name><value>%s</value></macro>\n'%
  (escape(key), escape(defines[key])))
 out.write(' </language>\n')

gyp/pylib/gyp/generator/make.py

@@ -821,7 +821,7 @@ def Write(self, qualified_target, base_path, output_filename, spec, configs,
 gyp.xcode_emulation.MacPrefixHeader(
 self.xcode_settings, lambdap: Sourceify(self.Absolutify(p)),
 self.Pchify))
-sources=filter(Compilable, all_sources)
+sources=list(filter(Compilable, all_sources))
 ifsources:
 self.WriteLn(SHARED_HEADER_SUFFIX_RULES_COMMENT1)
 extensions=set([os.path.splitext(s)[1] forsinsources])
@@ -950,7 +950,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 '%s%s'
 % (name, cd_action, command))
 self.WriteLn()
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 # The makefile rules are all relative to the top dir, but the gyp actions
 # are defined relative to their containing dir. This replaces the obj
 # variable for the action rule with an absolute version so that the output
@@ -974,7 +974,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-self.WriteDoCmd(outputs, map(Sourceify, map(self.Absolutify, inputs)),
+self.WriteDoCmd(outputs, [Sourceify(self.Absolutify(i)) foriininputs],
 part_of_all=part_of_all, command=name)
 
 # Stuff the outputs in a variable so we can refer to them later.
@@ -1023,8 +1023,8 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 extra_sources+=outputs
 ifint(rule.get('process_outputs_as_mac_bundle_resources', False)):
 extra_mac_bundle_resources+=outputs
-inputs=map(Sourceify, map(self.Absolutify, [rule_source] +
-rule.get('inputs', [])))
+inputs=[Sourceify(self.Absolutify(i)) fori
+in [rule_source] +rule.get('inputs', [])]
 actions= ['$(call do_cmd,%s_%d)'% (name, count)]
 
 ifname=='resources_grit':
@@ -1040,7 +1040,7 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 all_outputs+=outputs
 # Only write the 'obj' and 'builddir' rules for the "primary" output
 # (:1); it's superfluous for the "extra outputs", and this avoids
@@ -1147,7 +1147,7 @@ def WriteCopies(self, copies, extra_outputs, part_of_all):
 path=gyp.xcode_emulation.ExpandEnvVars(path, env)
 self.WriteDoCmd([output], [path], 'copy', part_of_all)
 outputs.append(output)
-self.WriteLn('%s = %s'% (variable, ' '.join(map(QuoteSpaces, outputs))))
+self.WriteLn('%s = %s'% (variable, ' '.join(QuoteSpaces(o) foroinoutputs)))
 extra_outputs.append('$(%s)'%variable)
 self.WriteLn()
 
@@ -1158,7 +1158,7 @@ def WriteMacBundleResources(self, resources, bundle_deps):
 
 foroutput, resingyp.xcode_emulation.GetMacBundleResources(
 generator_default_variables['PRODUCT_DIR'], self.xcode_settings,
-map(Sourceify, map(self.Absolutify, resources))):
+[Sourceify(self.Absolutify(r)) forrinresources]):
 _, ext=os.path.splitext(output)
 ifext!='.xcassets':
 # Make does not supports '.xcassets' emulation.
@@ -1238,11 +1238,11 @@ def WriteSources(self, configs, deps, sources,
 self.WriteList(cflags_objcc, 'CFLAGS_OBJCC_%s'%configname)
 includes=config.get('include_dirs')
 ifincludes:
-includes=map(Sourceify, map(self.Absolutify, includes))
+includes=[Sourceify(self.Absolutify(i)) foriinincludes]
 self.WriteList(includes, 'INCS_%s'%configname, prefix='-I')
 
-compilable=filter(Compilable, sources)
-objs=map(self.Objectify, map(self.Absolutify, map(Target, compilable)))
+compilable=list(filter(Compilable, sources))
+objs=[self.Objectify(self.Absolutify(Target(c)))forcincompilable]
 self.WriteList(objs, 'OBJS')
 
 forobjinobjs:
@@ -1314,7 +1314,7 @@ def WriteSources(self, configs, deps, sources,
 
 # If there are any object files in our input file list, link them into our
 # output.
-extra_link_deps+=filter(Linkable, sources)
+extra_link_deps+=list(filter(Linkable, sources))
 
 self.WriteLn()
 
@@ -1564,7 +1564,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 
 # Bundle dependencies. Note that the code below adds actions to this
 # target, so if you move these two lines, move the lines below as well.
-self.WriteList(map(QuoteSpaces, bundle_deps), 'BUNDLE_DEPS')
+self.WriteList([QuoteSpaces(dep) fordepinbundle_deps], 'BUNDLE_DEPS')
 self.WriteLn('%s: $(BUNDLE_DEPS)'%QuoteSpaces(self.output))
 
 # After the framework is built, package it. Needs to happen before
@@ -1598,7 +1598,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 ifself.type=='executable':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 ifself.toolset=='host'andself.flavor=='android':
 self.WriteDoCmd([self.output_binary], link_deps, 'link_host',
 part_of_all, postbuilds=postbuilds)
@@ -1620,7 +1620,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 elifself.type=='shared_library':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 self.WriteDoCmd([self.output_binary], link_deps, 'solink', part_of_all,
 postbuilds=postbuilds)
 elifself.type=='loadable_module':
@@ -1746,8 +1746,8 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
  output is just a name to run the rule
  command: (optional) command name to generate unambiguous labels
  """
-outputs=map(QuoteSpaces, outputs)
-inputs=map(QuoteSpaces, inputs)
+outputs=[QuoteSpaces(o) foroinoutputs]
+inputs=[QuoteSpaces(i) foriininputs]
 
 ifcomment:
 self.WriteLn('# '+comment)
@@ -1836,7 +1836,7 @@ def WriteAndroidNdkModuleRule(self, module_name, all_sources, link_deps):
 default_cpp_ext=ext
 self.WriteLn('LOCAL_CPP_EXTENSION := '+default_cpp_ext)
 
-self.WriteList(map(self.Absolutify, filter(Compilable, all_sources)),
+self.WriteList(list(map(self.Absolutify, filter(Compilable, all_sources))),
 'LOCAL_SRC_FILES')
 
 # Filter out those which do not match prefix and suffix and produce
@@ -1979,7 +1979,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name,
 "%(makefile_name)s: %(deps)s\n"
 "\t$(call do_cmd,regen_makefile)\n\n"% {
 'makefile_name': makefile_name,
-'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)),
+'deps': ' '.join(SourceifyAndQuoteSpaces(bf) forbfinbuild_files),
 'cmd': gyp.common.EncodePOSIXShellList(
  [gyp_binary, '-fmake'] +
 gyp.RegenerateFlags(options) +

gyp/pylib/gyp/generator/msvs.py

@@ -2691,7 +2691,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 platform_name=None
 msvs_windows_target_platform_version=None
-forconfigurationinspec['configurations'].itervalues():
+forconfigurationinspec['configurations'].values():
 platform_name=platform_nameor_ConfigPlatform(configuration)
 msvs_windows_target_platform_version= \
 msvs_windows_target_platform_versionor \
@@ -3252,7 +3252,7 @@ def _GetMSBuildProjectReferences(project):
  ['Project', guid],
  ['ReferenceOutputAssembly', 'false']
  ]
-forconfigindependency.spec.get('configurations', {}).itervalues():
+forconfigindependency.spec.get('configurations', {}).values():
 ifconfig.get('msvs_use_library_dependency_inputs', 0):
 project_ref.append(['UseLibraryDependencyInputs', 'true'])
 break
@@ -3321,7 +3321,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
 extension_to_rule_name, _GetUniquePlatforms(spec))
 missing_sources=_VerifySourcesExist(sources, project_dir)
 
-forconfigurationinconfigurations.itervalues():
+forconfigurationinconfigurations.values():
 _FinalizeMSBuildSettings(spec, configuration)
 
 # Add attributes to root element

gyp/pylib/gyp/input.py

@@ -4,14 +4,8 @@
 
 from __future__ importprint_function
 
-fromcompiler.astimportConst
-fromcompiler.astimportDict
-fromcompiler.astimportDiscard
-fromcompiler.astimportList
-fromcompiler.astimportModule
-fromcompiler.astimportNode
-fromcompiler.astimportStmt
-importcompiler
+importast
+
 importgyp.common
 importgyp.simple_copy
 importmultiprocessing
@@ -184,43 +178,39 @@ def CheckedEval(file_contents):
  Note that this is slower than eval() is.
  """
 
-ast=compiler.parse(file_contents)
-assertisinstance(ast, Module)
-c1=ast.getChildren()
-assertc1[0] isNone
-assertisinstance(c1[1], Stmt)
-c2=c1[1].getChildren()
-assertisinstance(c2[0], Discard)
-c3=c2[0].getChildren()
-assertlen(c3) ==1
-returnCheckNode(c3[0], [])
+syntax_tree=ast.parse(file_contents)
+assertisinstance(syntax_tree, ast.Module)
+c1=syntax_tree.body
+assertlen(c1) ==1
+c2=c1[0]
+assertisinstance(c2, ast.Expr)
+returnCheckNode(c2.value, [])
 
 
 defCheckNode(node, keypath):
-ifisinstance(node, Dict):
+ifisinstance(node, ast.Dict):
 c=node.getChildren()
 dict= {}
-forninrange(0, len(c), 2):
-assertisinstance(c[n], Const)
-key=c[n].getChildren()[0]
+forkey, valueinzip(node.keys, node.values):
+assertisinstance(key, ast.Str)
+key=key.s
 ifkeyindict:
 raiseGypError("Key '"+key+"' repeated at level "+
 repr(len(keypath) +1) +" with key path '"+
 '.'.join(keypath) +"'")
 kp=list(keypath) # Make a copy of the list for descending this node.
 kp.append(key)
-dict[key] =CheckNode(c[n+1], kp)
+dict[key] =CheckNode(value, kp)
 returndict
-elifisinstance(node, List):
-c=node.getChildren()
+elifisinstance(node, ast.List):
 children= []
-forindex, childinenumerate(c):
+forindex, childinenumerate(node.elts):
 kp=list(keypath) # Copy list.
 kp.append(repr(index))
 children.append(CheckNode(child, kp))
 returnchildren
-elifisinstance(node, Const):
-returnnode.getChildren()[0]
+elifisinstance(node, ast.Str):
+returnnode.s
 else:
 raiseTypeError("Unknown AST node at key path '"+'.'.join(keypath) +
 "': "+repr(node))
@@ -954,8 +944,12 @@ def ExpandVariables(input, phase, variables, build_file):
 else:
 replacement=variables[contents]
 
+ifisinstance(replacement, bytes) andnotisinstance(replacement, str):
+replacement=replacement.decode("utf-8") # done on Python 3 only
 iftype(replacement) islist:
 foriteminreplacement:
+ifisinstance(item, bytes) andnotisinstance(item, str):
+item=item.decode("utf-8") # done on Python 3 only
 ifnotcontents[-1] =='/'andtype(item) notin (str, int):
 raiseGypError('Variable '+contents+
 ' must expand to a string or list of strings; '+
@@ -1847,7 +1841,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 # Create a DependencyGraphNode for each gyp file containing a target. Put
 # it into a dict for easy access.
 dependency_nodes= {}
-fortargetintargets.iterkeys():
+fortargetintargets:
 build_file=gyp.common.BuildFile(target)
 ifnotbuild_fileindependency_nodes:
 dependency_nodes[build_file] =DependencyGraphNode(build_file)
@@ -1878,7 +1872,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 
 # Files that have no dependencies are treated as dependent on root_node.
 root_node=DependencyGraphNode(None)
-forbuild_file_nodeindependency_nodes.itervalues():
+forbuild_file_nodeindependency_nodes.values():
 iflen(build_file_node.dependencies) ==0:
 build_file_node.dependencies.append(root_node)
 root_node.dependents.append(build_file_node)

gyp/pylib/gyp/xcode_emulation.py

@@ -1636,7 +1636,7 @@ def _HasIOSTarget(targets):
 def_AddIOSDeviceConfigurations(targets):
 """Clone all targets and append -iphoneos to the name. Configure these targets
  to build for iOS devices and use correct architectures for those builds."""
-fortarget_dictintargets.itervalues():
+fortarget_dictintargets.values():
 toolset=target_dict['toolset']
 configs=target_dict['configurations']
 forconfig_name, config_dictindict(configs).items():

gyp/pylib/gyp/xcode_ninja.py

@@ -85,7 +85,7 @@ def _TargetFromSpec(old_spec, params):
 "%s/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"%ninja_toplevel
 
 if'configurations'inold_spec:
-forconfiginold_spec['configurations'].iterkeys():
+forconfiginold_spec['configurations']:
 old_xcode_settings= \
 old_spec['configurations'][config].get('xcode_settings', {})
 if'IPHONEOS_DEPLOYMENT_TARGET'inold_xcode_settings:

gyp/pylib/gyp/generator/analyzer.py

@@ -671,7 +671,7 @@ def find_matching_compile_target_names(self):
 assertself.is_build_impacted();
 # Compile targets are found by searching up from changed targets.
 # Reset the visited status for _GetBuildTargets.
-fortargetinself._name_to_target.itervalues():
+fortargetinself._name_to_target.values():
 target.visited=False
 
 supplied_targets=_LookupTargets(self._supplied_target_names_no_all(),

gyp/pylib/gyp/generator/eclipse.py

@@ -272,7 +272,7 @@ def WriteMacros(out, eclipse_langs, defines):
 out.write(' <language name="holder for library settings"></language>\n')
 forlangineclipse_langs:
 out.write(' <language name="%s">\n'%lang)
-forkeyinsorted(defines.iterkeys()):
+forkeyinsorted(defines):
 out.write(' <macro><name>%s</name><value>%s</value></macro>\n'%
  (escape(key), escape(defines[key])))
 out.write(' </language>\n')

gyp/pylib/gyp/generator/make.py

@@ -821,7 +821,7 @@ def Write(self, qualified_target, base_path, output_filename, spec, configs,
 gyp.xcode_emulation.MacPrefixHeader(
 self.xcode_settings, lambdap: Sourceify(self.Absolutify(p)),
 self.Pchify))
-sources=filter(Compilable, all_sources)
+sources=list(filter(Compilable, all_sources))
 ifsources:
 self.WriteLn(SHARED_HEADER_SUFFIX_RULES_COMMENT1)
 extensions=set([os.path.splitext(s)[1] forsinsources])
@@ -950,7 +950,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 '%s%s'
 % (name, cd_action, command))
 self.WriteLn()
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 # The makefile rules are all relative to the top dir, but the gyp actions
 # are defined relative to their containing dir. This replaces the obj
 # variable for the action rule with an absolute version so that the output
@@ -974,7 +974,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-self.WriteDoCmd(outputs, map(Sourceify, map(self.Absolutify, inputs)),
+self.WriteDoCmd(outputs, [Sourceify(self.Absolutify(i)) foriininputs],
 part_of_all=part_of_all, command=name)
 
 # Stuff the outputs in a variable so we can refer to them later.
@@ -1023,8 +1023,8 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 extra_sources+=outputs
 ifint(rule.get('process_outputs_as_mac_bundle_resources', False)):
 extra_mac_bundle_resources+=outputs
-inputs=map(Sourceify, map(self.Absolutify, [rule_source] +
-rule.get('inputs', [])))
+inputs=[Sourceify(self.Absolutify(i)) fori
+in [rule_source] +rule.get('inputs', [])]
 actions= ['$(call do_cmd,%s_%d)'% (name, count)]
 
 ifname=='resources_grit':
@@ -1040,7 +1040,7 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 all_outputs+=outputs
 # Only write the 'obj' and 'builddir' rules for the "primary" output
 # (:1); it's superfluous for the "extra outputs", and this avoids
@@ -1147,7 +1147,7 @@ def WriteCopies(self, copies, extra_outputs, part_of_all):
 path=gyp.xcode_emulation.ExpandEnvVars(path, env)
 self.WriteDoCmd([output], [path], 'copy', part_of_all)
 outputs.append(output)
-self.WriteLn('%s = %s'% (variable, ' '.join(map(QuoteSpaces, outputs))))
+self.WriteLn('%s = %s'% (variable, ' '.join(QuoteSpaces(o) foroinoutputs)))
 extra_outputs.append('$(%s)'%variable)
 self.WriteLn()
 
@@ -1158,7 +1158,7 @@ def WriteMacBundleResources(self, resources, bundle_deps):
 
 foroutput, resingyp.xcode_emulation.GetMacBundleResources(
 generator_default_variables['PRODUCT_DIR'], self.xcode_settings,
-map(Sourceify, map(self.Absolutify, resources))):
+[Sourceify(self.Absolutify(r)) forrinresources]):
 _, ext=os.path.splitext(output)
 ifext!='.xcassets':
 # Make does not supports '.xcassets' emulation.
@@ -1238,11 +1238,11 @@ def WriteSources(self, configs, deps, sources,
 self.WriteList(cflags_objcc, 'CFLAGS_OBJCC_%s'%configname)
 includes=config.get('include_dirs')
 ifincludes:
-includes=map(Sourceify, map(self.Absolutify, includes))
+includes=[Sourceify(self.Absolutify(i)) foriinincludes]
 self.WriteList(includes, 'INCS_%s'%configname, prefix='-I')
 
-compilable=filter(Compilable, sources)
-objs=map(self.Objectify, map(self.Absolutify, map(Target, compilable)))
+compilable=list(filter(Compilable, sources))
+objs=[self.Objectify(self.Absolutify(Target(c)))forcincompilable]
 self.WriteList(objs, 'OBJS')
 
 forobjinobjs:
@@ -1314,7 +1314,7 @@ def WriteSources(self, configs, deps, sources,
 
 # If there are any object files in our input file list, link them into our
 # output.
-extra_link_deps+=filter(Linkable, sources)
+extra_link_deps+=list(filter(Linkable, sources))
 
 self.WriteLn()
 
@@ -1564,7 +1564,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 
 # Bundle dependencies. Note that the code below adds actions to this
 # target, so if you move these two lines, move the lines below as well.
-self.WriteList(map(QuoteSpaces, bundle_deps), 'BUNDLE_DEPS')
+self.WriteList([QuoteSpaces(dep) fordepinbundle_deps], 'BUNDLE_DEPS')
 self.WriteLn('%s: $(BUNDLE_DEPS)'%QuoteSpaces(self.output))
 
 # After the framework is built, package it. Needs to happen before
@@ -1598,7 +1598,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 ifself.type=='executable':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 ifself.toolset=='host'andself.flavor=='android':
 self.WriteDoCmd([self.output_binary], link_deps, 'link_host',
 part_of_all, postbuilds=postbuilds)
@@ -1620,7 +1620,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 elifself.type=='shared_library':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 self.WriteDoCmd([self.output_binary], link_deps, 'solink', part_of_all,
 postbuilds=postbuilds)
 elifself.type=='loadable_module':
@@ -1746,8 +1746,8 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
  output is just a name to run the rule
  command: (optional) command name to generate unambiguous labels
  """
-outputs=map(QuoteSpaces, outputs)
-inputs=map(QuoteSpaces, inputs)
+outputs=[QuoteSpaces(o) foroinoutputs]
+inputs=[QuoteSpaces(i) foriininputs]
 
 ifcomment:
 self.WriteLn('# '+comment)
@@ -1836,7 +1836,7 @@ def WriteAndroidNdkModuleRule(self, module_name, all_sources, link_deps):
 default_cpp_ext=ext
 self.WriteLn('LOCAL_CPP_EXTENSION := '+default_cpp_ext)
 
-self.WriteList(map(self.Absolutify, filter(Compilable, all_sources)),
+self.WriteList(list(map(self.Absolutify, filter(Compilable, all_sources))),
 'LOCAL_SRC_FILES')
 
 # Filter out those which do not match prefix and suffix and produce
@@ -1979,7 +1979,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name,
 "%(makefile_name)s: %(deps)s\n"
 "\t$(call do_cmd,regen_makefile)\n\n"% {
 'makefile_name': makefile_name,
-'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)),
+'deps': ' '.join(SourceifyAndQuoteSpaces(bf) forbfinbuild_files),
 'cmd': gyp.common.EncodePOSIXShellList(
  [gyp_binary, '-fmake'] +
 gyp.RegenerateFlags(options) +

gyp/pylib/gyp/generator/msvs.py

@@ -2691,7 +2691,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 platform_name=None
 msvs_windows_target_platform_version=None
-forconfigurationinspec['configurations'].itervalues():
+forconfigurationinspec['configurations'].values():
 platform_name=platform_nameor_ConfigPlatform(configuration)
 msvs_windows_target_platform_version= \
 msvs_windows_target_platform_versionor \
@@ -3252,7 +3252,7 @@ def _GetMSBuildProjectReferences(project):
  ['Project', guid],
  ['ReferenceOutputAssembly', 'false']
  ]
-forconfigindependency.spec.get('configurations', {}).itervalues():
+forconfigindependency.spec.get('configurations', {}).values():
 ifconfig.get('msvs_use_library_dependency_inputs', 0):
 project_ref.append(['UseLibraryDependencyInputs', 'true'])
 break
@@ -3321,7 +3321,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
 extension_to_rule_name, _GetUniquePlatforms(spec))
 missing_sources=_VerifySourcesExist(sources, project_dir)
 
-forconfigurationinconfigurations.itervalues():
+forconfigurationinconfigurations.values():
 _FinalizeMSBuildSettings(spec, configuration)
 
 # Add attributes to root element

gyp/pylib/gyp/input.py

@@ -4,14 +4,8 @@
 
 from __future__ importprint_function
 
-fromcompiler.astimportConst
-fromcompiler.astimportDict
-fromcompiler.astimportDiscard
-fromcompiler.astimportList
-fromcompiler.astimportModule
-fromcompiler.astimportNode
-fromcompiler.astimportStmt
-importcompiler
+importast
+
 importgyp.common
 importgyp.simple_copy
 importmultiprocessing
@@ -184,43 +178,39 @@ def CheckedEval(file_contents):
  Note that this is slower than eval() is.
  """
 
-ast=compiler.parse(file_contents)
-assertisinstance(ast, Module)
-c1=ast.getChildren()
-assertc1[0] isNone
-assertisinstance(c1[1], Stmt)
-c2=c1[1].getChildren()
-assertisinstance(c2[0], Discard)
-c3=c2[0].getChildren()
-assertlen(c3) ==1
-returnCheckNode(c3[0], [])
+syntax_tree=ast.parse(file_contents)
+assertisinstance(syntax_tree, ast.Module)
+c1=syntax_tree.body
+assertlen(c1) ==1
+c2=c1[0]
+assertisinstance(c2, ast.Expr)
+returnCheckNode(c2.value, [])
 
 
 defCheckNode(node, keypath):
-ifisinstance(node, Dict):
+ifisinstance(node, ast.Dict):
 c=node.getChildren()
 dict= {}
-forninrange(0, len(c), 2):
-assertisinstance(c[n], Const)
-key=c[n].getChildren()[0]
+forkey, valueinzip(node.keys, node.values):
+assertisinstance(key, ast.Str)
+key=key.s
 ifkeyindict:
 raiseGypError("Key '"+key+"' repeated at level "+
 repr(len(keypath) +1) +" with key path '"+
 '.'.join(keypath) +"'")
 kp=list(keypath) # Make a copy of the list for descending this node.
 kp.append(key)
-dict[key] =CheckNode(c[n+1], kp)
+dict[key] =CheckNode(value, kp)
 returndict
-elifisinstance(node, List):
-c=node.getChildren()
+elifisinstance(node, ast.List):
 children= []
-forindex, childinenumerate(c):
+forindex, childinenumerate(node.elts):
 kp=list(keypath) # Copy list.
 kp.append(repr(index))
 children.append(CheckNode(child, kp))
 returnchildren
-elifisinstance(node, Const):
-returnnode.getChildren()[0]
+elifisinstance(node, ast.Str):
+returnnode.s
 else:
 raiseTypeError("Unknown AST node at key path '"+'.'.join(keypath) +
 "': "+repr(node))
@@ -954,8 +944,12 @@ def ExpandVariables(input, phase, variables, build_file):
 else:
 replacement=variables[contents]
 
+ifisinstance(replacement, bytes) andnotisinstance(replacement, str):
+replacement=replacement.decode("utf-8") # done on Python 3 only
 iftype(replacement) islist:
 foriteminreplacement:
+ifisinstance(item, bytes) andnotisinstance(item, str):
+item=item.decode("utf-8") # done on Python 3 only
 ifnotcontents[-1] =='/'andtype(item) notin (str, int):
 raiseGypError('Variable '+contents+
 ' must expand to a string or list of strings; '+
@@ -1847,7 +1841,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 # Create a DependencyGraphNode for each gyp file containing a target. Put
 # it into a dict for easy access.
 dependency_nodes= {}
-fortargetintargets.iterkeys():
+fortargetintargets:
 build_file=gyp.common.BuildFile(target)
 ifnotbuild_fileindependency_nodes:
 dependency_nodes[build_file] =DependencyGraphNode(build_file)
@@ -1878,7 +1872,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 
 # Files that have no dependencies are treated as dependent on root_node.
 root_node=DependencyGraphNode(None)
-forbuild_file_nodeindependency_nodes.itervalues():
+forbuild_file_nodeindependency_nodes.values():
 iflen(build_file_node.dependencies) ==0:
 build_file_node.dependencies.append(root_node)
 root_node.dependents.append(build_file_node)

gyp/pylib/gyp/xcode_emulation.py

@@ -1636,7 +1636,7 @@ def _HasIOSTarget(targets):
 def_AddIOSDeviceConfigurations(targets):
 """Clone all targets and append -iphoneos to the name. Configure these targets
  to build for iOS devices and use correct architectures for those builds."""
-fortarget_dictintargets.itervalues():
+fortarget_dictintargets.values():
 toolset=target_dict['toolset']
 configs=target_dict['configurations']
 forconfig_name, config_dictindict(configs).items():

gyp/pylib/gyp/xcode_ninja.py

@@ -85,7 +85,7 @@ def _TargetFromSpec(old_spec, params):
 "%s/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"%ninja_toplevel
 
 if'configurations'inold_spec:
-forconfiginold_spec['configurations'].iterkeys():
+forconfiginold_spec['configurations']:
 old_xcode_settings= \
 old_spec['configurations'][config].get('xcode_settings', {})
 if'IPHONEOS_DEPLOYMENT_TARGET'inold_xcode_settings:

gyp/pylib/gyp/generator/analyzer.py

@@ -671,7 +671,7 @@ def find_matching_compile_target_names(self):
 assertself.is_build_impacted();
 # Compile targets are found by searching up from changed targets.
 # Reset the visited status for _GetBuildTargets.
-fortargetinself._name_to_target.itervalues():
+fortargetinself._name_to_target.values():
 target.visited=False
 
 supplied_targets=_LookupTargets(self._supplied_target_names_no_all(),

gyp/pylib/gyp/generator/eclipse.py

@@ -272,7 +272,7 @@ def WriteMacros(out, eclipse_langs, defines):
 out.write(' <language name="holder for library settings"></language>\n')
 forlangineclipse_langs:
 out.write(' <language name="%s">\n'%lang)
-forkeyinsorted(defines.iterkeys()):
+forkeyinsorted(defines):
 out.write(' <macro><name>%s</name><value>%s</value></macro>\n'%
  (escape(key), escape(defines[key])))
 out.write(' </language>\n')

gyp/pylib/gyp/generator/make.py

@@ -821,7 +821,7 @@ def Write(self, qualified_target, base_path, output_filename, spec, configs,
 gyp.xcode_emulation.MacPrefixHeader(
 self.xcode_settings, lambdap: Sourceify(self.Absolutify(p)),
 self.Pchify))
-sources=filter(Compilable, all_sources)
+sources=list(filter(Compilable, all_sources))
 ifsources:
 self.WriteLn(SHARED_HEADER_SUFFIX_RULES_COMMENT1)
 extensions=set([os.path.splitext(s)[1] forsinsources])
@@ -950,7 +950,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 '%s%s'
 % (name, cd_action, command))
 self.WriteLn()
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 # The makefile rules are all relative to the top dir, but the gyp actions
 # are defined relative to their containing dir. This replaces the obj
 # variable for the action rule with an absolute version so that the output
@@ -974,7 +974,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-self.WriteDoCmd(outputs, map(Sourceify, map(self.Absolutify, inputs)),
+self.WriteDoCmd(outputs, [Sourceify(self.Absolutify(i)) foriininputs],
 part_of_all=part_of_all, command=name)
 
 # Stuff the outputs in a variable so we can refer to them later.
@@ -1023,8 +1023,8 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 extra_sources+=outputs
 ifint(rule.get('process_outputs_as_mac_bundle_resources', False)):
 extra_mac_bundle_resources+=outputs
-inputs=map(Sourceify, map(self.Absolutify, [rule_source] +
-rule.get('inputs', [])))
+inputs=[Sourceify(self.Absolutify(i)) fori
+in [rule_source] +rule.get('inputs', [])]
 actions= ['$(call do_cmd,%s_%d)'% (name, count)]
 
 ifname=='resources_grit':
@@ -1040,7 +1040,7 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 all_outputs+=outputs
 # Only write the 'obj' and 'builddir' rules for the "primary" output
 # (:1); it's superfluous for the "extra outputs", and this avoids
@@ -1147,7 +1147,7 @@ def WriteCopies(self, copies, extra_outputs, part_of_all):
 path=gyp.xcode_emulation.ExpandEnvVars(path, env)
 self.WriteDoCmd([output], [path], 'copy', part_of_all)
 outputs.append(output)
-self.WriteLn('%s = %s'% (variable, ' '.join(map(QuoteSpaces, outputs))))
+self.WriteLn('%s = %s'% (variable, ' '.join(QuoteSpaces(o) foroinoutputs)))
 extra_outputs.append('$(%s)'%variable)
 self.WriteLn()
 
@@ -1158,7 +1158,7 @@ def WriteMacBundleResources(self, resources, bundle_deps):
 
 foroutput, resingyp.xcode_emulation.GetMacBundleResources(
 generator_default_variables['PRODUCT_DIR'], self.xcode_settings,
-map(Sourceify, map(self.Absolutify, resources))):
+[Sourceify(self.Absolutify(r)) forrinresources]):
 _, ext=os.path.splitext(output)
 ifext!='.xcassets':
 # Make does not supports '.xcassets' emulation.
@@ -1238,11 +1238,11 @@ def WriteSources(self, configs, deps, sources,
 self.WriteList(cflags_objcc, 'CFLAGS_OBJCC_%s'%configname)
 includes=config.get('include_dirs')
 ifincludes:
-includes=map(Sourceify, map(self.Absolutify, includes))
+includes=[Sourceify(self.Absolutify(i)) foriinincludes]
 self.WriteList(includes, 'INCS_%s'%configname, prefix='-I')
 
-compilable=filter(Compilable, sources)
-objs=map(self.Objectify, map(self.Absolutify, map(Target, compilable)))
+compilable=list(filter(Compilable, sources))
+objs=[self.Objectify(self.Absolutify(Target(c)))forcincompilable]
 self.WriteList(objs, 'OBJS')
 
 forobjinobjs:
@@ -1314,7 +1314,7 @@ def WriteSources(self, configs, deps, sources,
 
 # If there are any object files in our input file list, link them into our
 # output.
-extra_link_deps+=filter(Linkable, sources)
+extra_link_deps+=list(filter(Linkable, sources))
 
 self.WriteLn()
 
@@ -1564,7 +1564,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 
 # Bundle dependencies. Note that the code below adds actions to this
 # target, so if you move these two lines, move the lines below as well.
-self.WriteList(map(QuoteSpaces, bundle_deps), 'BUNDLE_DEPS')
+self.WriteList([QuoteSpaces(dep) fordepinbundle_deps], 'BUNDLE_DEPS')
 self.WriteLn('%s: $(BUNDLE_DEPS)'%QuoteSpaces(self.output))
 
 # After the framework is built, package it. Needs to happen before
@@ -1598,7 +1598,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 ifself.type=='executable':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 ifself.toolset=='host'andself.flavor=='android':
 self.WriteDoCmd([self.output_binary], link_deps, 'link_host',
 part_of_all, postbuilds=postbuilds)
@@ -1620,7 +1620,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 elifself.type=='shared_library':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 self.WriteDoCmd([self.output_binary], link_deps, 'solink', part_of_all,
 postbuilds=postbuilds)
 elifself.type=='loadable_module':
@@ -1746,8 +1746,8 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
  output is just a name to run the rule
  command: (optional) command name to generate unambiguous labels
  """
-outputs=map(QuoteSpaces, outputs)
-inputs=map(QuoteSpaces, inputs)
+outputs=[QuoteSpaces(o) foroinoutputs]
+inputs=[QuoteSpaces(i) foriininputs]
 
 ifcomment:
 self.WriteLn('# '+comment)
@@ -1836,7 +1836,7 @@ def WriteAndroidNdkModuleRule(self, module_name, all_sources, link_deps):
 default_cpp_ext=ext
 self.WriteLn('LOCAL_CPP_EXTENSION := '+default_cpp_ext)
 
-self.WriteList(map(self.Absolutify, filter(Compilable, all_sources)),
+self.WriteList(list(map(self.Absolutify, filter(Compilable, all_sources))),
 'LOCAL_SRC_FILES')
 
 # Filter out those which do not match prefix and suffix and produce
@@ -1979,7 +1979,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name,
 "%(makefile_name)s: %(deps)s\n"
 "\t$(call do_cmd,regen_makefile)\n\n"% {
 'makefile_name': makefile_name,
-'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)),
+'deps': ' '.join(SourceifyAndQuoteSpaces(bf) forbfinbuild_files),
 'cmd': gyp.common.EncodePOSIXShellList(
  [gyp_binary, '-fmake'] +
 gyp.RegenerateFlags(options) +

gyp/pylib/gyp/generator/msvs.py

@@ -2691,7 +2691,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 platform_name=None
 msvs_windows_target_platform_version=None
-forconfigurationinspec['configurations'].itervalues():
+forconfigurationinspec['configurations'].values():
 platform_name=platform_nameor_ConfigPlatform(configuration)
 msvs_windows_target_platform_version= \
 msvs_windows_target_platform_versionor \
@@ -3252,7 +3252,7 @@ def _GetMSBuildProjectReferences(project):
  ['Project', guid],
  ['ReferenceOutputAssembly', 'false']
  ]
-forconfigindependency.spec.get('configurations', {}).itervalues():
+forconfigindependency.spec.get('configurations', {}).values():
 ifconfig.get('msvs_use_library_dependency_inputs', 0):
 project_ref.append(['UseLibraryDependencyInputs', 'true'])
 break
@@ -3321,7 +3321,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
 extension_to_rule_name, _GetUniquePlatforms(spec))
 missing_sources=_VerifySourcesExist(sources, project_dir)
 
-forconfigurationinconfigurations.itervalues():
+forconfigurationinconfigurations.values():
 _FinalizeMSBuildSettings(spec, configuration)
 
 # Add attributes to root element

gyp/pylib/gyp/input.py

@@ -4,14 +4,8 @@
 
 from __future__ importprint_function
 
-fromcompiler.astimportConst
-fromcompiler.astimportDict
-fromcompiler.astimportDiscard
-fromcompiler.astimportList
-fromcompiler.astimportModule
-fromcompiler.astimportNode
-fromcompiler.astimportStmt
-importcompiler
+importast
+
 importgyp.common
 importgyp.simple_copy
 importmultiprocessing
@@ -184,43 +178,39 @@ def CheckedEval(file_contents):
  Note that this is slower than eval() is.
  """
 
-ast=compiler.parse(file_contents)
-assertisinstance(ast, Module)
-c1=ast.getChildren()
-assertc1[0] isNone
-assertisinstance(c1[1], Stmt)
-c2=c1[1].getChildren()
-assertisinstance(c2[0], Discard)
-c3=c2[0].getChildren()
-assertlen(c3) ==1
-returnCheckNode(c3[0], [])
+syntax_tree=ast.parse(file_contents)
+assertisinstance(syntax_tree, ast.Module)
+c1=syntax_tree.body
+assertlen(c1) ==1
+c2=c1[0]
+assertisinstance(c2, ast.Expr)
+returnCheckNode(c2.value, [])
 
 
 defCheckNode(node, keypath):
-ifisinstance(node, Dict):
+ifisinstance(node, ast.Dict):
 c=node.getChildren()
 dict= {}
-forninrange(0, len(c), 2):
-assertisinstance(c[n], Const)
-key=c[n].getChildren()[0]
+forkey, valueinzip(node.keys, node.values):
+assertisinstance(key, ast.Str)
+key=key.s
 ifkeyindict:
 raiseGypError("Key '"+key+"' repeated at level "+
 repr(len(keypath) +1) +" with key path '"+
 '.'.join(keypath) +"'")
 kp=list(keypath) # Make a copy of the list for descending this node.
 kp.append(key)
-dict[key] =CheckNode(c[n+1], kp)
+dict[key] =CheckNode(value, kp)
 returndict
-elifisinstance(node, List):
-c=node.getChildren()
+elifisinstance(node, ast.List):
 children= []
-forindex, childinenumerate(c):
+forindex, childinenumerate(node.elts):
 kp=list(keypath) # Copy list.
 kp.append(repr(index))
 children.append(CheckNode(child, kp))
 returnchildren
-elifisinstance(node, Const):
-returnnode.getChildren()[0]
+elifisinstance(node, ast.Str):
+returnnode.s
 else:
 raiseTypeError("Unknown AST node at key path '"+'.'.join(keypath) +
 "': "+repr(node))
@@ -954,8 +944,12 @@ def ExpandVariables(input, phase, variables, build_file):
 else:
 replacement=variables[contents]
 
+ifisinstance(replacement, bytes) andnotisinstance(replacement, str):
+replacement=replacement.decode("utf-8") # done on Python 3 only
 iftype(replacement) islist:
 foriteminreplacement:
+ifisinstance(item, bytes) andnotisinstance(item, str):
+item=item.decode("utf-8") # done on Python 3 only
 ifnotcontents[-1] =='/'andtype(item) notin (str, int):
 raiseGypError('Variable '+contents+
 ' must expand to a string or list of strings; '+
@@ -1847,7 +1841,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 # Create a DependencyGraphNode for each gyp file containing a target. Put
 # it into a dict for easy access.
 dependency_nodes= {}
-fortargetintargets.iterkeys():
+fortargetintargets:
 build_file=gyp.common.BuildFile(target)
 ifnotbuild_fileindependency_nodes:
 dependency_nodes[build_file] =DependencyGraphNode(build_file)
@@ -1878,7 +1872,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 
 # Files that have no dependencies are treated as dependent on root_node.
 root_node=DependencyGraphNode(None)
-forbuild_file_nodeindependency_nodes.itervalues():
+forbuild_file_nodeindependency_nodes.values():
 iflen(build_file_node.dependencies) ==0:
 build_file_node.dependencies.append(root_node)
 root_node.dependents.append(build_file_node)

gyp/pylib/gyp/xcode_emulation.py

@@ -1636,7 +1636,7 @@ def _HasIOSTarget(targets):
 def_AddIOSDeviceConfigurations(targets):
 """Clone all targets and append -iphoneos to the name. Configure these targets
  to build for iOS devices and use correct architectures for those builds."""
-fortarget_dictintargets.itervalues():
+fortarget_dictintargets.values():
 toolset=target_dict['toolset']
 configs=target_dict['configurations']
 forconfig_name, config_dictindict(configs).items():

gyp/pylib/gyp/xcode_ninja.py

@@ -85,7 +85,7 @@ def _TargetFromSpec(old_spec, params):
 "%s/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"%ninja_toplevel
 
 if'configurations'inold_spec:
-forconfiginold_spec['configurations'].iterkeys():
+forconfiginold_spec['configurations']:
 old_xcode_settings= \
 old_spec['configurations'][config].get('xcode_settings', {})
 if'IPHONEOS_DEPLOYMENT_TARGET'inold_xcode_settings:

gyp/pylib/gyp/generator/analyzer.py

@@ -671,7 +671,7 @@ def find_matching_compile_target_names(self):
 assertself.is_build_impacted();
 # Compile targets are found by searching up from changed targets.
 # Reset the visited status for _GetBuildTargets.
-fortargetinself._name_to_target.itervalues():
+fortargetinself._name_to_target.values():
 target.visited=False
 
 supplied_targets=_LookupTargets(self._supplied_target_names_no_all(),

gyp/pylib/gyp/generator/eclipse.py

@@ -272,7 +272,7 @@ def WriteMacros(out, eclipse_langs, defines):
 out.write(' <language name="holder for library settings"></language>\n')
 forlangineclipse_langs:
 out.write(' <language name="%s">\n'%lang)
-forkeyinsorted(defines.iterkeys()):
+forkeyinsorted(defines):
 out.write(' <macro><name>%s</name><value>%s</value></macro>\n'%
  (escape(key), escape(defines[key])))
 out.write(' </language>\n')

gyp/pylib/gyp/generator/make.py

@@ -821,7 +821,7 @@ def Write(self, qualified_target, base_path, output_filename, spec, configs,
 gyp.xcode_emulation.MacPrefixHeader(
 self.xcode_settings, lambdap: Sourceify(self.Absolutify(p)),
 self.Pchify))
-sources=filter(Compilable, all_sources)
+sources=list(filter(Compilable, all_sources))
 ifsources:
 self.WriteLn(SHARED_HEADER_SUFFIX_RULES_COMMENT1)
 extensions=set([os.path.splitext(s)[1] forsinsources])
@@ -950,7 +950,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 '%s%s'
 % (name, cd_action, command))
 self.WriteLn()
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 # The makefile rules are all relative to the top dir, but the gyp actions
 # are defined relative to their containing dir. This replaces the obj
 # variable for the action rule with an absolute version so that the output
@@ -974,7 +974,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-self.WriteDoCmd(outputs, map(Sourceify, map(self.Absolutify, inputs)),
+self.WriteDoCmd(outputs, [Sourceify(self.Absolutify(i)) foriininputs],
 part_of_all=part_of_all, command=name)
 
 # Stuff the outputs in a variable so we can refer to them later.
@@ -1023,8 +1023,8 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 extra_sources+=outputs
 ifint(rule.get('process_outputs_as_mac_bundle_resources', False)):
 extra_mac_bundle_resources+=outputs
-inputs=map(Sourceify, map(self.Absolutify, [rule_source] +
-rule.get('inputs', [])))
+inputs=[Sourceify(self.Absolutify(i)) fori
+in [rule_source] +rule.get('inputs', [])]
 actions= ['$(call do_cmd,%s_%d)'% (name, count)]
 
 ifname=='resources_grit':
@@ -1040,7 +1040,7 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 all_outputs+=outputs
 # Only write the 'obj' and 'builddir' rules for the "primary" output
 # (:1); it's superfluous for the "extra outputs", and this avoids
@@ -1147,7 +1147,7 @@ def WriteCopies(self, copies, extra_outputs, part_of_all):
 path=gyp.xcode_emulation.ExpandEnvVars(path, env)
 self.WriteDoCmd([output], [path], 'copy', part_of_all)
 outputs.append(output)
-self.WriteLn('%s = %s'% (variable, ' '.join(map(QuoteSpaces, outputs))))
+self.WriteLn('%s = %s'% (variable, ' '.join(QuoteSpaces(o) foroinoutputs)))
 extra_outputs.append('$(%s)'%variable)
 self.WriteLn()
 
@@ -1158,7 +1158,7 @@ def WriteMacBundleResources(self, resources, bundle_deps):
 
 foroutput, resingyp.xcode_emulation.GetMacBundleResources(
 generator_default_variables['PRODUCT_DIR'], self.xcode_settings,
-map(Sourceify, map(self.Absolutify, resources))):
+[Sourceify(self.Absolutify(r)) forrinresources]):
 _, ext=os.path.splitext(output)
 ifext!='.xcassets':
 # Make does not supports '.xcassets' emulation.
@@ -1238,11 +1238,11 @@ def WriteSources(self, configs, deps, sources,
 self.WriteList(cflags_objcc, 'CFLAGS_OBJCC_%s'%configname)
 includes=config.get('include_dirs')
 ifincludes:
-includes=map(Sourceify, map(self.Absolutify, includes))
+includes=[Sourceify(self.Absolutify(i)) foriinincludes]
 self.WriteList(includes, 'INCS_%s'%configname, prefix='-I')
 
-compilable=filter(Compilable, sources)
-objs=map(self.Objectify, map(self.Absolutify, map(Target, compilable)))
+compilable=list(filter(Compilable, sources))
+objs=[self.Objectify(self.Absolutify(Target(c)))forcincompilable]
 self.WriteList(objs, 'OBJS')
 
 forobjinobjs:
@@ -1314,7 +1314,7 @@ def WriteSources(self, configs, deps, sources,
 
 # If there are any object files in our input file list, link them into our
 # output.
-extra_link_deps+=filter(Linkable, sources)
+extra_link_deps+=list(filter(Linkable, sources))
 
 self.WriteLn()
 
@@ -1564,7 +1564,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 
 # Bundle dependencies. Note that the code below adds actions to this
 # target, so if you move these two lines, move the lines below as well.
-self.WriteList(map(QuoteSpaces, bundle_deps), 'BUNDLE_DEPS')
+self.WriteList([QuoteSpaces(dep) fordepinbundle_deps], 'BUNDLE_DEPS')
 self.WriteLn('%s: $(BUNDLE_DEPS)'%QuoteSpaces(self.output))
 
 # After the framework is built, package it. Needs to happen before
@@ -1598,7 +1598,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 ifself.type=='executable':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 ifself.toolset=='host'andself.flavor=='android':
 self.WriteDoCmd([self.output_binary], link_deps, 'link_host',
 part_of_all, postbuilds=postbuilds)
@@ -1620,7 +1620,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 elifself.type=='shared_library':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 self.WriteDoCmd([self.output_binary], link_deps, 'solink', part_of_all,
 postbuilds=postbuilds)
 elifself.type=='loadable_module':
@@ -1746,8 +1746,8 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
  output is just a name to run the rule
  command: (optional) command name to generate unambiguous labels
  """
-outputs=map(QuoteSpaces, outputs)
-inputs=map(QuoteSpaces, inputs)
+outputs=[QuoteSpaces(o) foroinoutputs]
+inputs=[QuoteSpaces(i) foriininputs]
 
 ifcomment:
 self.WriteLn('# '+comment)
@@ -1836,7 +1836,7 @@ def WriteAndroidNdkModuleRule(self, module_name, all_sources, link_deps):
 default_cpp_ext=ext
 self.WriteLn('LOCAL_CPP_EXTENSION := '+default_cpp_ext)
 
-self.WriteList(map(self.Absolutify, filter(Compilable, all_sources)),
+self.WriteList(list(map(self.Absolutify, filter(Compilable, all_sources))),
 'LOCAL_SRC_FILES')
 
 # Filter out those which do not match prefix and suffix and produce
@@ -1979,7 +1979,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name,
 "%(makefile_name)s: %(deps)s\n"
 "\t$(call do_cmd,regen_makefile)\n\n"% {
 'makefile_name': makefile_name,
-'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)),
+'deps': ' '.join(SourceifyAndQuoteSpaces(bf) forbfinbuild_files),
 'cmd': gyp.common.EncodePOSIXShellList(
  [gyp_binary, '-fmake'] +
 gyp.RegenerateFlags(options) +

gyp/pylib/gyp/generator/msvs.py

@@ -2691,7 +2691,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 platform_name=None
 msvs_windows_target_platform_version=None
-forconfigurationinspec['configurations'].itervalues():
+forconfigurationinspec['configurations'].values():
 platform_name=platform_nameor_ConfigPlatform(configuration)
 msvs_windows_target_platform_version= \
 msvs_windows_target_platform_versionor \
@@ -3252,7 +3252,7 @@ def _GetMSBuildProjectReferences(project):
  ['Project', guid],
  ['ReferenceOutputAssembly', 'false']
  ]
-forconfigindependency.spec.get('configurations', {}).itervalues():
+forconfigindependency.spec.get('configurations', {}).values():
 ifconfig.get('msvs_use_library_dependency_inputs', 0):
 project_ref.append(['UseLibraryDependencyInputs', 'true'])
 break
@@ -3321,7 +3321,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
 extension_to_rule_name, _GetUniquePlatforms(spec))
 missing_sources=_VerifySourcesExist(sources, project_dir)
 
-forconfigurationinconfigurations.itervalues():
+forconfigurationinconfigurations.values():
 _FinalizeMSBuildSettings(spec, configuration)
 
 # Add attributes to root element

gyp/pylib/gyp/input.py

@@ -4,14 +4,8 @@
 
 from __future__ importprint_function
 
-fromcompiler.astimportConst
-fromcompiler.astimportDict
-fromcompiler.astimportDiscard
-fromcompiler.astimportList
-fromcompiler.astimportModule
-fromcompiler.astimportNode
-fromcompiler.astimportStmt
-importcompiler
+importast
+
 importgyp.common
 importgyp.simple_copy
 importmultiprocessing
@@ -184,43 +178,39 @@ def CheckedEval(file_contents):
  Note that this is slower than eval() is.
  """
 
-ast=compiler.parse(file_contents)
-assertisinstance(ast, Module)
-c1=ast.getChildren()
-assertc1[0] isNone
-assertisinstance(c1[1], Stmt)
-c2=c1[1].getChildren()
-assertisinstance(c2[0], Discard)
-c3=c2[0].getChildren()
-assertlen(c3) ==1
-returnCheckNode(c3[0], [])
+syntax_tree=ast.parse(file_contents)
+assertisinstance(syntax_tree, ast.Module)
+c1=syntax_tree.body
+assertlen(c1) ==1
+c2=c1[0]
+assertisinstance(c2, ast.Expr)
+returnCheckNode(c2.value, [])
 
 
 defCheckNode(node, keypath):
-ifisinstance(node, Dict):
+ifisinstance(node, ast.Dict):
 c=node.getChildren()
 dict= {}
-forninrange(0, len(c), 2):
-assertisinstance(c[n], Const)
-key=c[n].getChildren()[0]
+forkey, valueinzip(node.keys, node.values):
+assertisinstance(key, ast.Str)
+key=key.s
 ifkeyindict:
 raiseGypError("Key '"+key+"' repeated at level "+
 repr(len(keypath) +1) +" with key path '"+
 '.'.join(keypath) +"'")
 kp=list(keypath) # Make a copy of the list for descending this node.
 kp.append(key)
-dict[key] =CheckNode(c[n+1], kp)
+dict[key] =CheckNode(value, kp)
 returndict
-elifisinstance(node, List):
-c=node.getChildren()
+elifisinstance(node, ast.List):
 children= []
-forindex, childinenumerate(c):
+forindex, childinenumerate(node.elts):
 kp=list(keypath) # Copy list.
 kp.append(repr(index))
 children.append(CheckNode(child, kp))
 returnchildren
-elifisinstance(node, Const):
-returnnode.getChildren()[0]
+elifisinstance(node, ast.Str):
+returnnode.s
 else:
 raiseTypeError("Unknown AST node at key path '"+'.'.join(keypath) +
 "': "+repr(node))
@@ -954,8 +944,12 @@ def ExpandVariables(input, phase, variables, build_file):
 else:
 replacement=variables[contents]
 
+ifisinstance(replacement, bytes) andnotisinstance(replacement, str):
+replacement=replacement.decode("utf-8") # done on Python 3 only
 iftype(replacement) islist:
 foriteminreplacement:
+ifisinstance(item, bytes) andnotisinstance(item, str):
+item=item.decode("utf-8") # done on Python 3 only
 ifnotcontents[-1] =='/'andtype(item) notin (str, int):
 raiseGypError('Variable '+contents+
 ' must expand to a string or list of strings; '+
@@ -1847,7 +1841,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 # Create a DependencyGraphNode for each gyp file containing a target. Put
 # it into a dict for easy access.
 dependency_nodes= {}
-fortargetintargets.iterkeys():
+fortargetintargets:
 build_file=gyp.common.BuildFile(target)
 ifnotbuild_fileindependency_nodes:
 dependency_nodes[build_file] =DependencyGraphNode(build_file)
@@ -1878,7 +1872,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 
 # Files that have no dependencies are treated as dependent on root_node.
 root_node=DependencyGraphNode(None)
-forbuild_file_nodeindependency_nodes.itervalues():
+forbuild_file_nodeindependency_nodes.values():
 iflen(build_file_node.dependencies) ==0:
 build_file_node.dependencies.append(root_node)
 root_node.dependents.append(build_file_node)

gyp/pylib/gyp/xcode_emulation.py

@@ -1636,7 +1636,7 @@ def _HasIOSTarget(targets):
 def_AddIOSDeviceConfigurations(targets):
 """Clone all targets and append -iphoneos to the name. Configure these targets
  to build for iOS devices and use correct architectures for those builds."""
-fortarget_dictintargets.itervalues():
+fortarget_dictintargets.values():
 toolset=target_dict['toolset']
 configs=target_dict['configurations']
 forconfig_name, config_dictindict(configs).items():

gyp/pylib/gyp/xcode_ninja.py

@@ -85,7 +85,7 @@ def _TargetFromSpec(old_spec, params):
 "%s/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"%ninja_toplevel
 
 if'configurations'inold_spec:
-forconfiginold_spec['configurations'].iterkeys():
+forconfiginold_spec['configurations']:
 old_xcode_settings= \
 old_spec['configurations'][config].get('xcode_settings', {})
 if'IPHONEOS_DEPLOYMENT_TARGET'inold_xcode_settings:

gyp/pylib/gyp/generator/analyzer.py

@@ -671,7 +671,7 @@ def find_matching_compile_target_names(self):
 assertself.is_build_impacted();
 # Compile targets are found by searching up from changed targets.
 # Reset the visited status for _GetBuildTargets.
-fortargetinself._name_to_target.itervalues():
+fortargetinself._name_to_target.values():
 target.visited=False
 
 supplied_targets=_LookupTargets(self._supplied_target_names_no_all(),

gyp/pylib/gyp/generator/eclipse.py

@@ -272,7 +272,7 @@ def WriteMacros(out, eclipse_langs, defines):
 out.write(' <language name="holder for library settings"></language>\n')
 forlangineclipse_langs:
 out.write(' <language name="%s">\n'%lang)
-forkeyinsorted(defines.iterkeys()):
+forkeyinsorted(defines):
 out.write(' <macro><name>%s</name><value>%s</value></macro>\n'%
  (escape(key), escape(defines[key])))
 out.write(' </language>\n')

gyp/pylib/gyp/generator/make.py

@@ -821,7 +821,7 @@ def Write(self, qualified_target, base_path, output_filename, spec, configs,
 gyp.xcode_emulation.MacPrefixHeader(
 self.xcode_settings, lambdap: Sourceify(self.Absolutify(p)),
 self.Pchify))
-sources=filter(Compilable, all_sources)
+sources=list(filter(Compilable, all_sources))
 ifsources:
 self.WriteLn(SHARED_HEADER_SUFFIX_RULES_COMMENT1)
 extensions=set([os.path.splitext(s)[1] forsinsources])
@@ -950,7 +950,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 '%s%s'
 % (name, cd_action, command))
 self.WriteLn()
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 # The makefile rules are all relative to the top dir, but the gyp actions
 # are defined relative to their containing dir. This replaces the obj
 # variable for the action rule with an absolute version so that the output
@@ -974,7 +974,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-self.WriteDoCmd(outputs, map(Sourceify, map(self.Absolutify, inputs)),
+self.WriteDoCmd(outputs, [Sourceify(self.Absolutify(i)) foriininputs],
 part_of_all=part_of_all, command=name)
 
 # Stuff the outputs in a variable so we can refer to them later.
@@ -1023,8 +1023,8 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 extra_sources+=outputs
 ifint(rule.get('process_outputs_as_mac_bundle_resources', False)):
 extra_mac_bundle_resources+=outputs
-inputs=map(Sourceify, map(self.Absolutify, [rule_source] +
-rule.get('inputs', [])))
+inputs=[Sourceify(self.Absolutify(i)) fori
+in [rule_source] +rule.get('inputs', [])]
 actions= ['$(call do_cmd,%s_%d)'% (name, count)]
 
 ifname=='resources_grit':
@@ -1040,7 +1040,7 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 all_outputs+=outputs
 # Only write the 'obj' and 'builddir' rules for the "primary" output
 # (:1); it's superfluous for the "extra outputs", and this avoids
@@ -1147,7 +1147,7 @@ def WriteCopies(self, copies, extra_outputs, part_of_all):
 path=gyp.xcode_emulation.ExpandEnvVars(path, env)
 self.WriteDoCmd([output], [path], 'copy', part_of_all)
 outputs.append(output)
-self.WriteLn('%s = %s'% (variable, ' '.join(map(QuoteSpaces, outputs))))
+self.WriteLn('%s = %s'% (variable, ' '.join(QuoteSpaces(o) foroinoutputs)))
 extra_outputs.append('$(%s)'%variable)
 self.WriteLn()
 
@@ -1158,7 +1158,7 @@ def WriteMacBundleResources(self, resources, bundle_deps):
 
 foroutput, resingyp.xcode_emulation.GetMacBundleResources(
 generator_default_variables['PRODUCT_DIR'], self.xcode_settings,
-map(Sourceify, map(self.Absolutify, resources))):
+[Sourceify(self.Absolutify(r)) forrinresources]):
 _, ext=os.path.splitext(output)
 ifext!='.xcassets':
 # Make does not supports '.xcassets' emulation.
@@ -1238,11 +1238,11 @@ def WriteSources(self, configs, deps, sources,
 self.WriteList(cflags_objcc, 'CFLAGS_OBJCC_%s'%configname)
 includes=config.get('include_dirs')
 ifincludes:
-includes=map(Sourceify, map(self.Absolutify, includes))
+includes=[Sourceify(self.Absolutify(i)) foriinincludes]
 self.WriteList(includes, 'INCS_%s'%configname, prefix='-I')
 
-compilable=filter(Compilable, sources)
-objs=map(self.Objectify, map(self.Absolutify, map(Target, compilable)))
+compilable=list(filter(Compilable, sources))
+objs=[self.Objectify(self.Absolutify(Target(c)))forcincompilable]
 self.WriteList(objs, 'OBJS')
 
 forobjinobjs:
@@ -1314,7 +1314,7 @@ def WriteSources(self, configs, deps, sources,
 
 # If there are any object files in our input file list, link them into our
 # output.
-extra_link_deps+=filter(Linkable, sources)
+extra_link_deps+=list(filter(Linkable, sources))
 
 self.WriteLn()
 
@@ -1564,7 +1564,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 
 # Bundle dependencies. Note that the code below adds actions to this
 # target, so if you move these two lines, move the lines below as well.
-self.WriteList(map(QuoteSpaces, bundle_deps), 'BUNDLE_DEPS')
+self.WriteList([QuoteSpaces(dep) fordepinbundle_deps], 'BUNDLE_DEPS')
 self.WriteLn('%s: $(BUNDLE_DEPS)'%QuoteSpaces(self.output))
 
 # After the framework is built, package it. Needs to happen before
@@ -1598,7 +1598,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 ifself.type=='executable':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 ifself.toolset=='host'andself.flavor=='android':
 self.WriteDoCmd([self.output_binary], link_deps, 'link_host',
 part_of_all, postbuilds=postbuilds)
@@ -1620,7 +1620,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 elifself.type=='shared_library':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 self.WriteDoCmd([self.output_binary], link_deps, 'solink', part_of_all,
 postbuilds=postbuilds)
 elifself.type=='loadable_module':
@@ -1746,8 +1746,8 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
  output is just a name to run the rule
  command: (optional) command name to generate unambiguous labels
  """
-outputs=map(QuoteSpaces, outputs)
-inputs=map(QuoteSpaces, inputs)
+outputs=[QuoteSpaces(o) foroinoutputs]
+inputs=[QuoteSpaces(i) foriininputs]
 
 ifcomment:
 self.WriteLn('# '+comment)
@@ -1836,7 +1836,7 @@ def WriteAndroidNdkModuleRule(self, module_name, all_sources, link_deps):
 default_cpp_ext=ext
 self.WriteLn('LOCAL_CPP_EXTENSION := '+default_cpp_ext)
 
-self.WriteList(map(self.Absolutify, filter(Compilable, all_sources)),
+self.WriteList(list(map(self.Absolutify, filter(Compilable, all_sources))),
 'LOCAL_SRC_FILES')
 
 # Filter out those which do not match prefix and suffix and produce
@@ -1979,7 +1979,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name,
 "%(makefile_name)s: %(deps)s\n"
 "\t$(call do_cmd,regen_makefile)\n\n"% {
 'makefile_name': makefile_name,
-'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)),
+'deps': ' '.join(SourceifyAndQuoteSpaces(bf) forbfinbuild_files),
 'cmd': gyp.common.EncodePOSIXShellList(
  [gyp_binary, '-fmake'] +
 gyp.RegenerateFlags(options) +

gyp/pylib/gyp/generator/msvs.py

@@ -2691,7 +2691,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 platform_name=None
 msvs_windows_target_platform_version=None
-forconfigurationinspec['configurations'].itervalues():
+forconfigurationinspec['configurations'].values():
 platform_name=platform_nameor_ConfigPlatform(configuration)
 msvs_windows_target_platform_version= \
 msvs_windows_target_platform_versionor \
@@ -3252,7 +3252,7 @@ def _GetMSBuildProjectReferences(project):
  ['Project', guid],
  ['ReferenceOutputAssembly', 'false']
  ]
-forconfigindependency.spec.get('configurations', {}).itervalues():
+forconfigindependency.spec.get('configurations', {}).values():
 ifconfig.get('msvs_use_library_dependency_inputs', 0):
 project_ref.append(['UseLibraryDependencyInputs', 'true'])
 break
@@ -3321,7 +3321,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
 extension_to_rule_name, _GetUniquePlatforms(spec))
 missing_sources=_VerifySourcesExist(sources, project_dir)
 
-forconfigurationinconfigurations.itervalues():
+forconfigurationinconfigurations.values():
 _FinalizeMSBuildSettings(spec, configuration)
 
 # Add attributes to root element

gyp/pylib/gyp/input.py

@@ -4,14 +4,8 @@
 
 from __future__ importprint_function
 
-fromcompiler.astimportConst
-fromcompiler.astimportDict
-fromcompiler.astimportDiscard
-fromcompiler.astimportList
-fromcompiler.astimportModule
-fromcompiler.astimportNode
-fromcompiler.astimportStmt
-importcompiler
+importast
+
 importgyp.common
 importgyp.simple_copy
 importmultiprocessing
@@ -184,43 +178,39 @@ def CheckedEval(file_contents):
  Note that this is slower than eval() is.
  """
 
-ast=compiler.parse(file_contents)
-assertisinstance(ast, Module)
-c1=ast.getChildren()
-assertc1[0] isNone
-assertisinstance(c1[1], Stmt)
-c2=c1[1].getChildren()
-assertisinstance(c2[0], Discard)
-c3=c2[0].getChildren()
-assertlen(c3) ==1
-returnCheckNode(c3[0], [])
+syntax_tree=ast.parse(file_contents)
+assertisinstance(syntax_tree, ast.Module)
+c1=syntax_tree.body
+assertlen(c1) ==1
+c2=c1[0]
+assertisinstance(c2, ast.Expr)
+returnCheckNode(c2.value, [])
 
 
 defCheckNode(node, keypath):
-ifisinstance(node, Dict):
+ifisinstance(node, ast.Dict):
 c=node.getChildren()
 dict= {}
-forninrange(0, len(c), 2):
-assertisinstance(c[n], Const)
-key=c[n].getChildren()[0]
+forkey, valueinzip(node.keys, node.values):
+assertisinstance(key, ast.Str)
+key=key.s
 ifkeyindict:
 raiseGypError("Key '"+key+"' repeated at level "+
 repr(len(keypath) +1) +" with key path '"+
 '.'.join(keypath) +"'")
 kp=list(keypath) # Make a copy of the list for descending this node.
 kp.append(key)
-dict[key] =CheckNode(c[n+1], kp)
+dict[key] =CheckNode(value, kp)
 returndict
-elifisinstance(node, List):
-c=node.getChildren()
+elifisinstance(node, ast.List):
 children= []
-forindex, childinenumerate(c):
+forindex, childinenumerate(node.elts):
 kp=list(keypath) # Copy list.
 kp.append(repr(index))
 children.append(CheckNode(child, kp))
 returnchildren
-elifisinstance(node, Const):
-returnnode.getChildren()[0]
+elifisinstance(node, ast.Str):
+returnnode.s
 else:
 raiseTypeError("Unknown AST node at key path '"+'.'.join(keypath) +
 "': "+repr(node))
@@ -954,8 +944,12 @@ def ExpandVariables(input, phase, variables, build_file):
 else:
 replacement=variables[contents]
 
+ifisinstance(replacement, bytes) andnotisinstance(replacement, str):
+replacement=replacement.decode("utf-8") # done on Python 3 only
 iftype(replacement) islist:
 foriteminreplacement:
+ifisinstance(item, bytes) andnotisinstance(item, str):
+item=item.decode("utf-8") # done on Python 3 only
 ifnotcontents[-1] =='/'andtype(item) notin (str, int):
 raiseGypError('Variable '+contents+
 ' must expand to a string or list of strings; '+
@@ -1847,7 +1841,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 # Create a DependencyGraphNode for each gyp file containing a target. Put
 # it into a dict for easy access.
 dependency_nodes= {}
-fortargetintargets.iterkeys():
+fortargetintargets:
 build_file=gyp.common.BuildFile(target)
 ifnotbuild_fileindependency_nodes:
 dependency_nodes[build_file] =DependencyGraphNode(build_file)
@@ -1878,7 +1872,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 
 # Files that have no dependencies are treated as dependent on root_node.
 root_node=DependencyGraphNode(None)
-forbuild_file_nodeindependency_nodes.itervalues():
+forbuild_file_nodeindependency_nodes.values():
 iflen(build_file_node.dependencies) ==0:
 build_file_node.dependencies.append(root_node)
 root_node.dependents.append(build_file_node)

gyp/pylib/gyp/xcode_emulation.py

@@ -1636,7 +1636,7 @@ def _HasIOSTarget(targets):
 def_AddIOSDeviceConfigurations(targets):
 """Clone all targets and append -iphoneos to the name. Configure these targets
  to build for iOS devices and use correct architectures for those builds."""
-fortarget_dictintargets.itervalues():
+fortarget_dictintargets.values():
 toolset=target_dict['toolset']
 configs=target_dict['configurations']
 forconfig_name, config_dictindict(configs).items():

gyp/pylib/gyp/xcode_ninja.py

@@ -85,7 +85,7 @@ def _TargetFromSpec(old_spec, params):
 "%s/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"%ninja_toplevel
 
 if'configurations'inold_spec:
-forconfiginold_spec['configurations'].iterkeys():
+forconfiginold_spec['configurations']:
 old_xcode_settings= \
 old_spec['configurations'][config].get('xcode_settings', {})
 if'IPHONEOS_DEPLOYMENT_TARGET'inold_xcode_settings:

gyp/pylib/gyp/generator/analyzer.py

@@ -671,7 +671,7 @@ def find_matching_compile_target_names(self):
 assertself.is_build_impacted();
 # Compile targets are found by searching up from changed targets.
 # Reset the visited status for _GetBuildTargets.
-fortargetinself._name_to_target.itervalues():
+fortargetinself._name_to_target.values():
 target.visited=False
 
 supplied_targets=_LookupTargets(self._supplied_target_names_no_all(),

gyp/pylib/gyp/generator/eclipse.py

@@ -272,7 +272,7 @@ def WriteMacros(out, eclipse_langs, defines):
 out.write(' <language name="holder for library settings"></language>\n')
 forlangineclipse_langs:
 out.write(' <language name="%s">\n'%lang)
-forkeyinsorted(defines.iterkeys()):
+forkeyinsorted(defines):
 out.write(' <macro><name>%s</name><value>%s</value></macro>\n'%
  (escape(key), escape(defines[key])))
 out.write(' </language>\n')

gyp/pylib/gyp/generator/make.py

@@ -821,7 +821,7 @@ def Write(self, qualified_target, base_path, output_filename, spec, configs,
 gyp.xcode_emulation.MacPrefixHeader(
 self.xcode_settings, lambdap: Sourceify(self.Absolutify(p)),
 self.Pchify))
-sources=filter(Compilable, all_sources)
+sources=list(filter(Compilable, all_sources))
 ifsources:
 self.WriteLn(SHARED_HEADER_SUFFIX_RULES_COMMENT1)
 extensions=set([os.path.splitext(s)[1] forsinsources])
@@ -950,7 +950,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 '%s%s'
 % (name, cd_action, command))
 self.WriteLn()
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 # The makefile rules are all relative to the top dir, but the gyp actions
 # are defined relative to their containing dir. This replaces the obj
 # variable for the action rule with an absolute version so that the output
@@ -974,7 +974,7 @@ def WriteActions(self, actions, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-self.WriteDoCmd(outputs, map(Sourceify, map(self.Absolutify, inputs)),
+self.WriteDoCmd(outputs, [Sourceify(self.Absolutify(i)) foriininputs],
 part_of_all=part_of_all, command=name)
 
 # Stuff the outputs in a variable so we can refer to them later.
@@ -1023,8 +1023,8 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 extra_sources+=outputs
 ifint(rule.get('process_outputs_as_mac_bundle_resources', False)):
 extra_mac_bundle_resources+=outputs
-inputs=map(Sourceify, map(self.Absolutify, [rule_source] +
-rule.get('inputs', [])))
+inputs=[Sourceify(self.Absolutify(i)) fori
+in [rule_source] +rule.get('inputs', [])]
 actions= ['$(call do_cmd,%s_%d)'% (name, count)]
 
 ifname=='resources_grit':
@@ -1040,7 +1040,7 @@ def WriteRules(self, rules, extra_sources, extra_outputs,
 outputs= [gyp.xcode_emulation.ExpandEnvVars(o, env) foroinoutputs]
 inputs= [gyp.xcode_emulation.ExpandEnvVars(i, env) foriininputs]
 
-outputs=map(self.Absolutify, outputs)
+outputs=[self.Absolutify(output) foroutputinoutputs]
 all_outputs+=outputs
 # Only write the 'obj' and 'builddir' rules for the "primary" output
 # (:1); it's superfluous for the "extra outputs", and this avoids
@@ -1147,7 +1147,7 @@ def WriteCopies(self, copies, extra_outputs, part_of_all):
 path=gyp.xcode_emulation.ExpandEnvVars(path, env)
 self.WriteDoCmd([output], [path], 'copy', part_of_all)
 outputs.append(output)
-self.WriteLn('%s = %s'% (variable, ' '.join(map(QuoteSpaces, outputs))))
+self.WriteLn('%s = %s'% (variable, ' '.join(QuoteSpaces(o) foroinoutputs)))
 extra_outputs.append('$(%s)'%variable)
 self.WriteLn()
 
@@ -1158,7 +1158,7 @@ def WriteMacBundleResources(self, resources, bundle_deps):
 
 foroutput, resingyp.xcode_emulation.GetMacBundleResources(
 generator_default_variables['PRODUCT_DIR'], self.xcode_settings,
-map(Sourceify, map(self.Absolutify, resources))):
+[Sourceify(self.Absolutify(r)) forrinresources]):
 _, ext=os.path.splitext(output)
 ifext!='.xcassets':
 # Make does not supports '.xcassets' emulation.
@@ -1238,11 +1238,11 @@ def WriteSources(self, configs, deps, sources,
 self.WriteList(cflags_objcc, 'CFLAGS_OBJCC_%s'%configname)
 includes=config.get('include_dirs')
 ifincludes:
-includes=map(Sourceify, map(self.Absolutify, includes))
+includes=[Sourceify(self.Absolutify(i)) foriinincludes]
 self.WriteList(includes, 'INCS_%s'%configname, prefix='-I')
 
-compilable=filter(Compilable, sources)
-objs=map(self.Objectify, map(self.Absolutify, map(Target, compilable)))
+compilable=list(filter(Compilable, sources))
+objs=[self.Objectify(self.Absolutify(Target(c)))forcincompilable]
 self.WriteList(objs, 'OBJS')
 
 forobjinobjs:
@@ -1314,7 +1314,7 @@ def WriteSources(self, configs, deps, sources,
 
 # If there are any object files in our input file list, link them into our
 # output.
-extra_link_deps+=filter(Linkable, sources)
+extra_link_deps+=list(filter(Linkable, sources))
 
 self.WriteLn()
 
@@ -1564,7 +1564,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 
 # Bundle dependencies. Note that the code below adds actions to this
 # target, so if you move these two lines, move the lines below as well.
-self.WriteList(map(QuoteSpaces, bundle_deps), 'BUNDLE_DEPS')
+self.WriteList([QuoteSpaces(dep) fordepinbundle_deps], 'BUNDLE_DEPS')
 self.WriteLn('%s: $(BUNDLE_DEPS)'%QuoteSpaces(self.output))
 
 # After the framework is built, package it. Needs to happen before
@@ -1598,7 +1598,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 ifself.type=='executable':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 ifself.toolset=='host'andself.flavor=='android':
 self.WriteDoCmd([self.output_binary], link_deps, 'link_host',
 part_of_all, postbuilds=postbuilds)
@@ -1620,7 +1620,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 elifself.type=='shared_library':
 self.WriteLn('%s: LD_INPUTS := %s'% (
 QuoteSpaces(self.output_binary),
-' '.join(map(QuoteSpaces, link_deps))))
+' '.join(QuoteSpaces(dep) fordepinlink_deps)))
 self.WriteDoCmd([self.output_binary], link_deps, 'solink', part_of_all,
 postbuilds=postbuilds)
 elifself.type=='loadable_module':
@@ -1746,8 +1746,8 @@ def WriteMakeRule(self, outputs, inputs, actions=None, comment=None,
  output is just a name to run the rule
  command: (optional) command name to generate unambiguous labels
  """
-outputs=map(QuoteSpaces, outputs)
-inputs=map(QuoteSpaces, inputs)
+outputs=[QuoteSpaces(o) foroinoutputs]
+inputs=[QuoteSpaces(i) foriininputs]
 
 ifcomment:
 self.WriteLn('# '+comment)
@@ -1836,7 +1836,7 @@ def WriteAndroidNdkModuleRule(self, module_name, all_sources, link_deps):
 default_cpp_ext=ext
 self.WriteLn('LOCAL_CPP_EXTENSION := '+default_cpp_ext)
 
-self.WriteList(map(self.Absolutify, filter(Compilable, all_sources)),
+self.WriteList(list(map(self.Absolutify, filter(Compilable, all_sources))),
 'LOCAL_SRC_FILES')
 
 # Filter out those which do not match prefix and suffix and produce
@@ -1979,7 +1979,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name,
 "%(makefile_name)s: %(deps)s\n"
 "\t$(call do_cmd,regen_makefile)\n\n"% {
 'makefile_name': makefile_name,
-'deps': ' '.join(map(SourceifyAndQuoteSpaces, build_files)),
+'deps': ' '.join(SourceifyAndQuoteSpaces(bf) forbfinbuild_files),
 'cmd': gyp.common.EncodePOSIXShellList(
  [gyp_binary, '-fmake'] +
 gyp.RegenerateFlags(options) +

gyp/pylib/gyp/generator/msvs.py

@@ -2691,7 +2691,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 platform_name=None
 msvs_windows_target_platform_version=None
-forconfigurationinspec['configurations'].itervalues():
+forconfigurationinspec['configurations'].values():
 platform_name=platform_nameor_ConfigPlatform(configuration)
 msvs_windows_target_platform_version= \
 msvs_windows_target_platform_versionor \
@@ -3252,7 +3252,7 @@ def _GetMSBuildProjectReferences(project):
  ['Project', guid],
  ['ReferenceOutputAssembly', 'false']
  ]
-forconfigindependency.spec.get('configurations', {}).itervalues():
+forconfigindependency.spec.get('configurations', {}).values():
 ifconfig.get('msvs_use_library_dependency_inputs', 0):
 project_ref.append(['UseLibraryDependencyInputs', 'true'])
 break
@@ -3321,7 +3321,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
 extension_to_rule_name, _GetUniquePlatforms(spec))
 missing_sources=_VerifySourcesExist(sources, project_dir)
 
-forconfigurationinconfigurations.itervalues():
+forconfigurationinconfigurations.values():
 _FinalizeMSBuildSettings(spec, configuration)
 
 # Add attributes to root element

gyp/pylib/gyp/input.py

@@ -4,14 +4,8 @@
 
 from __future__ importprint_function
 
-fromcompiler.astimportConst
-fromcompiler.astimportDict
-fromcompiler.astimportDiscard
-fromcompiler.astimportList
-fromcompiler.astimportModule
-fromcompiler.astimportNode
-fromcompiler.astimportStmt
-importcompiler
+importast
+
 importgyp.common
 importgyp.simple_copy
 importmultiprocessing
@@ -184,43 +178,39 @@ def CheckedEval(file_contents):
  Note that this is slower than eval() is.
  """
 
-ast=compiler.parse(file_contents)
-assertisinstance(ast, Module)
-c1=ast.getChildren()
-assertc1[0] isNone
-assertisinstance(c1[1], Stmt)
-c2=c1[1].getChildren()
-assertisinstance(c2[0], Discard)
-c3=c2[0].getChildren()
-assertlen(c3) ==1
-returnCheckNode(c3[0], [])
+syntax_tree=ast.parse(file_contents)
+assertisinstance(syntax_tree, ast.Module)
+c1=syntax_tree.body
+assertlen(c1) ==1
+c2=c1[0]
+assertisinstance(c2, ast.Expr)
+returnCheckNode(c2.value, [])
 
 
 defCheckNode(node, keypath):
-ifisinstance(node, Dict):
+ifisinstance(node, ast.Dict):
 c=node.getChildren()
 dict= {}
-forninrange(0, len(c), 2):
-assertisinstance(c[n], Const)
-key=c[n].getChildren()[0]
+forkey, valueinzip(node.keys, node.values):
+assertisinstance(key, ast.Str)
+key=key.s
 ifkeyindict:
 raiseGypError("Key '"+key+"' repeated at level "+
 repr(len(keypath) +1) +" with key path '"+
 '.'.join(keypath) +"'")
 kp=list(keypath) # Make a copy of the list for descending this node.
 kp.append(key)
-dict[key] =CheckNode(c[n+1], kp)
+dict[key] =CheckNode(value, kp)
 returndict
-elifisinstance(node, List):
-c=node.getChildren()
+elifisinstance(node, ast.List):
 children= []
-forindex, childinenumerate(c):
+forindex, childinenumerate(node.elts):
 kp=list(keypath) # Copy list.
 kp.append(repr(index))
 children.append(CheckNode(child, kp))
 returnchildren
-elifisinstance(node, Const):
-returnnode.getChildren()[0]
+elifisinstance(node, ast.Str):
+returnnode.s
 else:
 raiseTypeError("Unknown AST node at key path '"+'.'.join(keypath) +
 "': "+repr(node))
@@ -954,8 +944,12 @@ def ExpandVariables(input, phase, variables, build_file):
 else:
 replacement=variables[contents]
 
+ifisinstance(replacement, bytes) andnotisinstance(replacement, str):
+replacement=replacement.decode("utf-8") # done on Python 3 only
 iftype(replacement) islist:
 foriteminreplacement:
+ifisinstance(item, bytes) andnotisinstance(item, str):
+item=item.decode("utf-8") # done on Python 3 only
 ifnotcontents[-1] =='/'andtype(item) notin (str, int):
 raiseGypError('Variable '+contents+
 ' must expand to a string or list of strings; '+
@@ -1847,7 +1841,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 # Create a DependencyGraphNode for each gyp file containing a target. Put
 # it into a dict for easy access.
 dependency_nodes= {}
-fortargetintargets.iterkeys():
+fortargetintargets:
 build_file=gyp.common.BuildFile(target)
 ifnotbuild_fileindependency_nodes:
 dependency_nodes[build_file] =DependencyGraphNode(build_file)
@@ -1878,7 +1872,7 @@ def VerifyNoGYPFileCircularDependencies(targets):
 
 # Files that have no dependencies are treated as dependent on root_node.
 root_node=DependencyGraphNode(None)
-forbuild_file_nodeindependency_nodes.itervalues():
+forbuild_file_nodeindependency_nodes.values():
 iflen(build_file_node.dependencies) ==0:
 build_file_node.dependencies.append(root_node)
 root_node.dependents.append(build_file_node)

gyp/pylib/gyp/xcode_emulation.py

@@ -1636,7 +1636,7 @@ def _HasIOSTarget(targets):
 def_AddIOSDeviceConfigurations(targets):
 """Clone all targets and append -iphoneos to the name. Configure these targets
  to build for iOS devices and use correct architectures for those builds."""
-fortarget_dictintargets.itervalues():
+fortarget_dictintargets.values():
 toolset=target_dict['toolset']
 configs=target_dict['configurations']
 forconfig_name, config_dictindict(configs).items():

gyp/pylib/gyp/xcode_ninja.py

@@ -85,7 +85,7 @@ def _TargetFromSpec(old_spec, params):
 "%s/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"%ninja_toplevel
 
 if'configurations'inold_spec:
-forconfiginold_spec['configurations'].iterkeys():
+forconfiginold_spec['configurations']:
 old_xcode_settings= \
 old_spec['configurations'][config].get('xcode_settings', {})
 if'IPHONEOS_DEPLOYMENT_TARGET'inold_xcode_settings: