gyp: replace deprecated functions

* assertEquals() with assertEqual()
* iteritems() with items() for Python 3.
* xrange() with range() for Python 3.
#1150
Reviewed-By: Refael Ackermann <refack@gmail.com>

Author: rodrigc

gyp/PRESUBMIT.py

@@ -76,8 +76,7 @@
 def_LicenseHeader(input_api):
 # Accept any year number from 2009 to the current year.
 current_year=int(input_api.time.strftime('%Y'))
-allowed_years= (str(s) forsinreversed(xrange(2009, current_year+1)))
-
+allowed_years= (str(s) forsinreversed(range(2009, current_year+1)))
 years_re='('+'|'.join(allowed_years) +')'
 
 # The (c) is deprecated, but tolerate it until it's removed from all files.

gyp/pylib/gyp/MSVSSettings.py

@@ -435,7 +435,7 @@ def ConvertVCMacrosToMSBuild(s):
 '$(PlatformName)': '$(Platform)',
 '$(SafeInputName)': '%(Filename)',
  }
-forold, newinreplace_map.iteritems():
+forold, newinreplace_map.items():
 s=s.replace(old, new)
 s=FixVCMacroSlashes(s)
 returns
@@ -455,10 +455,10 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  dictionaries of settings and their values.
  """
 msbuild_settings= {}
-formsvs_tool_name, msvs_tool_settingsinmsvs_settings.iteritems():
+formsvs_tool_name, msvs_tool_settingsinmsvs_settings.items():
 ifmsvs_tool_namein_msvs_to_msbuild_converters:
 msvs_tool=_msvs_to_msbuild_converters[msvs_tool_name]
-formsvs_setting, msvs_valueinmsvs_tool_settings.iteritems():
+formsvs_setting, msvs_valueinmsvs_tool_settings.items():
 ifmsvs_settinginmsvs_tool:
 # Invoke the translation function.
 try:
@@ -515,7 +515,7 @@ def _ValidateSettings(validators, settings, stderr):
 fortool_nameinsettings:
 iftool_nameinvalidators:
 tool_validators=validators[tool_name]
-forsetting, valueinsettings[tool_name].iteritems():
+forsetting, valueinsettings[tool_name].items():
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)

gyp/pylib/gyp/MSVSUserFile.py

@@ -91,7 +91,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 
 ifenvironmentandisinstance(environment, dict):
 env_list= ['%s="%s"'% (key, val)
-for (key,val) inenvironment.iteritems()]
+for (key,val) inenvironment.items()]
 environment=' '.join(env_list)
 else:
 environment=''
@@ -135,7 +135,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 defWriteIfChanged(self):
 """Writes the user file."""
 configs= ['Configurations']
-forconfig, specinsorted(self.configurations.iteritems()):
+forconfig, specinsorted(self.configurations.items()):
 configs.append(spec)
 
 content= ['VisualStudioUserFile',

gyp/pylib/gyp/MSVSUtil.py

@@ -235,7 +235,7 @@ def InsertLargePdbShims(target_list, target_dicts, vars):
 
 # Set up the shim to output its PDB to the same location as the final linker
 # target.
-forconfig_name, configinshim_dict.get('configurations').iteritems():
+forconfig_name, configinshim_dict.get('configurations').items():
 pdb_path=_GetPdbPath(target_dict, config_name, vars)
 
 # A few keys that we don't want to propagate.

gyp/pylib/gyp/__init__.py

@@ -209,7 +209,7 @@ def Noop(value):
 # We always want to ignore the environment when regenerating, to avoid
 # duplicate or changed flags in the environment at the time of regeneration.
 flags= ['--ignore-environment']
-forname, metadatainoptions._regeneration_metadata.iteritems():
+forname, metadatainoptions._regeneration_metadata.items():
 opt=metadata['opt']
 value=getattr(options, name)
 value_predicate=metadata['type'] =='path'andFixPathorNoop
@@ -434,7 +434,7 @@ def gyp_main(args):
 build_file_dir=os.path.abspath(os.path.dirname(build_file))
 build_file_dir_components=build_file_dir.split(os.path.sep)
 components_len=len(build_file_dir_components)
-forindexinxrange(components_len-1, -1, -1):
+forindexinrange(components_len-1, -1, -1):
 ifbuild_file_dir_components[index] =='src':
 options.depth=os.path.sep.join(build_file_dir_components)
 break

gyp/pylib/gyp/easy_xml.py

@@ -81,7 +81,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
 # Optionally in second position is a dictionary of the attributes.
 rest=specification[1:]
 ifrestandisinstance(rest[0], dict):
-forat, valinsorted(rest[0].iteritems()):
+forat, valinsorted(rest[0].items()):
 xml_parts.append(' %s="%s"'% (at, _XmlEscape(val, attr=True)))
 rest=rest[1:]
 ifrest:

gyp/pylib/gyp/generator/android.py

@@ -460,7 +460,7 @@ def WriteSourceFlags(self, spec, configs):
  Args:
  spec, configs: input from gyp.
  """
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 extracted_includes= []
 
 self.WriteLn('\n# Flags passed to both C and C++ files.')
@@ -790,7 +790,7 @@ def WriteTargetFlags(self, spec, configs, link_deps):
 static_libs, dynamic_libs, ldflags_libs=self.FilterLibraries(libraries)
 
 ifself.type!='static_library':
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 ldflags=list(config.get('ldflags', []))
 self.WriteLn('')
 self.WriteList(ldflags, 'LOCAL_LDFLAGS_%s'%configname)
@@ -839,7 +839,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, part_of_all,
 settings=spec.get('aosp_build_settings', {})
 ifsettings:
 self.WriteLn('### Set directly by aosp_build_settings.')
-fork, vinsettings.iteritems():
+fork, vinsettings.items():
 ifisinstance(v, list):
 self.WriteList(v, k)
 else:

gyp/pylib/gyp/generator/gypd.py

@@ -88,7 +88,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 ifnotoutput_fileinoutput_files:
 output_files[output_file] =input_file
 
-foroutput_file, input_fileinoutput_files.iteritems():
+foroutput_file, input_fileinoutput_files.items():
 output=open(output_file, 'w')
 pprint.pprint(data[input_file], output)
 output.close()

gyp/pylib/gyp/generator/make.py

@@ -674,7 +674,7 @@ def _ValidateSourcesForOSX(spec, all_sources):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1547,7 +1547,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 # Postbuilds expect to be run in the gyp file's directory, so insert an
 # implicit postbuild to cd to there.
 postbuilds.insert(0, gyp.common.EncodePOSIXShellList(['cd', self.path]))
-foriinxrange(len(postbuilds)):
+foriinrange(len(postbuilds)):
 ifnotpostbuilds[i].startswith('$'):
 postbuilds[i] =EscapeShellArgument(postbuilds[i])
 self.WriteLn('%s: builddir := $(abs_builddir)'%QuoteSpaces(self.output))

gyp/pylib/gyp/generator/msvs.py

@@ -451,7 +451,7 @@ def _AddCustomBuildToolForMSVS(p, spec, primary_input,
 'CommandLine': cmd,
  })
 # Add to the properties of primary input for each config.
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 p.AddFileConfig(_FixPath(primary_input),
 _ConfigFullName(config_name, c_data), tools=[tool])
 
@@ -971,7 +971,7 @@ def _ValidateSourcesForMSVSProject(spec, version):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1003,7 +1003,7 @@ def _GenerateMSVSProject(project, options, version, generator_flags):
 relative_path_of_gyp_file=gyp.common.RelativePath(gyp_path, project_dir)
 
 config_type=_GetMSVSConfigurationType(spec, project.build_file)
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config)
 
 # MSVC08 and prior version cannot handle duplicate basenames in the same
@@ -1369,10 +1369,10 @@ def _ConvertToolsToExpectedForm(tools):
  A list of Tool objects.
  """
 tool_list= []
-fortool, settingsintools.iteritems():
+fortool, settingsintools.items():
 # Collapse settings with lists.
 settings_fixed= {}
-forsetting, valueinsettings.iteritems():
+forsetting, valueinsettings.items():
 iftype(value) ==list:
 if ((tool=='VCLinkerTool'and
 setting=='AdditionalDependencies') or
@@ -1547,7 +1547,7 @@ def _IdlFilesHandledNonNatively(spec, sources):
 def_GetPrecompileRelatedFiles(spec):
 # Gather a list of precompiled header related sources.
 precompiled_related= []
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forkinprecomp_keys:
 f=config.get(k)
 iff:
@@ -1558,7 +1558,7 @@ def _GetPrecompileRelatedFiles(spec):
 def_ExcludeFilesFromBeingBuilt(p, spec, excluded_sources, excluded_idl,
 list_excluded):
 exclusions=_GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl)
-forfile_name, excluded_configsinexclusions.iteritems():
+forfile_name, excluded_configsinexclusions.items():
 if (notlist_excludedand
 len(excluded_configs) ==len(spec['configurations'])):
 # If we're not listing excluded files, then they won't appear in the
@@ -1575,7 +1575,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude excluded sources from being built.
 forfinexcluded_sources:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 precomped= [_FixPath(config.get(i, '')) foriinprecomp_keys]
 # Don't do this for ones that are precompiled header related.
 iffnotinprecomped:
@@ -1585,7 +1585,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude them now.
 forfinexcluded_idl:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 excluded_configs.append((config_name, config))
 exclusions[f] =excluded_configs
 returnexclusions
@@ -1594,7 +1594,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 def_AddToolFilesToMSVS(p, spec):
 # Add in tool files (rules).
 tool_files=OrderedSet()
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forfinconfig.get('msvs_tool_files', []):
 tool_files.add(f)
 forfintool_files:
@@ -1607,7 +1607,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
 # kind (i.e. C vs. C++) as the precompiled header source stub needs
 # to have use of precompiled headers disabled.
 extensions_excluded_from_precompile= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 source=config.get('msvs_precompiled_source')
 ifsource:
 source=_FixPath(source)
@@ -1628,7 +1628,7 @@ def DisableForSourceTree(source_tree):
 else:
 basename, extension=os.path.splitext(source)
 ifextensioninextensions_excluded_from_precompile:
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 tool=MSVSProject.Tool('VCCLCompilerTool',
  {'UsePrecompiledHeader': '0',
 'ForcedIncludeFiles': '$(NOINHERIT)'})
@@ -1679,7 +1679,7 @@ def _WriteMSVSUserFile(project_path, version, spec):
 return# Nothing to add
 # Write out the user file.
 user_file=_CreateMSVSUserFile(project_path, version, spec)
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 user_file.AddDebugSettings(_ConfigFullName(config_name, c_data),
 action, environment, working_directory)
 user_file.WriteIfChanged()
@@ -1730,7 +1730,7 @@ def _GetPathDict(root, path):
 def_DictsToFolders(base_path, bucket, flat):
 # Convert to folders recursively.
 children= []
-forfolder, contentsinbucket.iteritems():
+forfolder, contentsinbucket.items():
 iftype(contents) ==dict:
 folder_children=_DictsToFolders(os.path.join(base_path, folder),
 contents, flat)
@@ -1802,7 +1802,7 @@ def _GetPlatformOverridesOfProject(spec):
 # Prepare a dict indicating which project configurations are used for which
 # solution configurations for this target.
 config_platform_overrides= {}
-forconfig_name, cinspec['configurations'].iteritems():
+forconfig_name, cinspec['configurations'].items():
 config_fullname=_ConfigFullName(config_name, c)
 platform=c.get('msvs_target_platform', _ConfigPlatform(c))
 fixed_config_fullname='%s|%s'% (
@@ -1941,7 +1941,7 @@ def PerformBuild(data, configurations, params):
 msvs_version=params['msvs_version']
 devenv=os.path.join(msvs_version.path, 'Common7', 'IDE', 'devenv.com')
 
-forbuild_file, build_file_dictindata.iteritems():
+forbuild_file, build_file_dictindata.items():
  (build_file_root, build_file_ext) =os.path.splitext(build_file)
 ifbuild_file_ext!='.gyp':
 continue
@@ -1990,7 +1990,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 configs=set()
 forqualified_targetintarget_list:
 spec=target_dicts[qualified_target]
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 configs.add(_ConfigFullName(config_name, config))
 configs=list(configs)
 
@@ -2630,7 +2630,7 @@ def _GetConfigurationCondition(name, settings):
 
 def_GetMSBuildProjectConfigurations(configurations):
 group= ['ItemGroup', {'Label': 'ProjectConfigurations'}]
-for (name, settings) insorted(configurations.iteritems()):
+for (name, settings) insorted(configurations.items()):
 configuration, platform=_GetConfigurationAndPlatform(name, settings)
 designation='%s|%s'% (configuration, platform)
 group.append(
@@ -2700,7 +2700,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 def_GetMSBuildConfigurationDetails(spec, build_file):
 properties= {}
-forname, settingsinspec['configurations'].iteritems():
+forname, settingsinspec['configurations'].items():
 msbuild_attributes=_GetMSBuildAttributes(spec, settings, build_file)
 condition=_GetConfigurationCondition(name, settings)
 character_set=msbuild_attributes.get('CharacterSet')
@@ -2729,7 +2729,7 @@ def _GetMSBuildPropertySheets(configurations):
 user_props=r'$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'
 additional_props= {}
 props_specified=False
-forname, settingsinsorted(configurations.iteritems()):
+forname, settingsinsorted(configurations.items()):
 configuration=_GetConfigurationCondition(name, settings)
 if'msbuild_props'insettings:
 additional_props[configuration] =_FixPaths(settings['msbuild_props'])
@@ -2751,7 +2751,7 @@ def _GetMSBuildPropertySheets(configurations):
  ]
 else:
 sheets= []
-forcondition, propsinadditional_props.iteritems():
+forcondition, propsinadditional_props.items():
 import_group= [
 'ImportGroup',
  {'Label': 'PropertySheets',
@@ -2878,7 +2878,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 new_paths='$(ExecutablePath);'+';'.join(new_paths)
 
 properties= {}
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 condition=_GetConfigurationCondition(name, configuration)
 attributes=_GetMSBuildAttributes(spec, configuration, build_file)
 msbuild_settings=configuration['finalized_msbuild_settings']
@@ -2903,7 +2903,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 _AddConditionalProperty(properties, condition, 'ExecutablePath',
 new_paths)
 tool_settings=msbuild_settings.get('', {})
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild('', name, value)
 _AddConditionalProperty(properties, condition, name, formatted_value)
 return_GetMSBuildPropertyGroup(spec, None, properties)
@@ -2972,7 +2972,7 @@ def GetEdges(node):
 # NOTE: reverse(topsort(DAG)) = topsort(reverse_edges(DAG))
 fornameinreversed(properties_ordered):
 values=properties[name]
-forvalue, conditionsinsorted(values.iteritems()):
+forvalue, conditionsinsorted(values.items()):
 iflen(conditions) ==num_configurations:
 # If the value is the same all configurations,
 # just add one unconditional entry.
@@ -2985,18 +2985,18 @@ def GetEdges(node):
 
 def_GetMSBuildToolSettingsSections(spec, configurations):
 groups= []
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 msbuild_settings=configuration['finalized_msbuild_settings']
 group= ['ItemDefinitionGroup',
  {'Condition': _GetConfigurationCondition(name, configuration)}
  ]
-fortool_name, tool_settingsinsorted(msbuild_settings.iteritems()):
+fortool_name, tool_settingsinsorted(msbuild_settings.items()):
 # Skip the tool named '' which is a holder of global settings handled
 # by _GetMSBuildConfigurationGlobalProperties.
 iftool_name:
 iftool_settings:
 tool= [tool_name]
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild(tool_name, name,
 value)
 tool.append([name, formatted_value])
@@ -3196,7 +3196,7 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
  {'Condition': condition},
 'true'])
 # Add precompile if needed
-forconfig_name, configurationinspec['configurations'].iteritems():
+forconfig_name, configurationinspec['configurations'].items():
 precompiled_source=configuration.get('msvs_precompiled_source', '')
 ifprecompiled_source!='':
 precompiled_source=_FixPath(precompiled_source)
@@ -3436,7 +3436,7 @@ def _GenerateActionsForMSBuild(spec, actions_to_add):
  """
 sources_handled_by_action=OrderedSet()
 actions_spec= []
-forprimary_input, actionsinactions_to_add.iteritems():
+forprimary_input, actionsinactions_to_add.items():
 inputs=OrderedSet()
 outputs=OrderedSet()
 descriptions= []

gyp/PRESUBMIT.py

@@ -76,8 +76,7 @@
 def_LicenseHeader(input_api):
 # Accept any year number from 2009 to the current year.
 current_year=int(input_api.time.strftime('%Y'))
-allowed_years= (str(s) forsinreversed(xrange(2009, current_year+1)))
-
+allowed_years= (str(s) forsinreversed(range(2009, current_year+1)))
 years_re='('+'|'.join(allowed_years) +')'
 
 # The (c) is deprecated, but tolerate it until it's removed from all files.

gyp/pylib/gyp/MSVSSettings.py

@@ -435,7 +435,7 @@ def ConvertVCMacrosToMSBuild(s):
 '$(PlatformName)': '$(Platform)',
 '$(SafeInputName)': '%(Filename)',
  }
-forold, newinreplace_map.iteritems():
+forold, newinreplace_map.items():
 s=s.replace(old, new)
 s=FixVCMacroSlashes(s)
 returns
@@ -455,10 +455,10 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  dictionaries of settings and their values.
  """
 msbuild_settings= {}
-formsvs_tool_name, msvs_tool_settingsinmsvs_settings.iteritems():
+formsvs_tool_name, msvs_tool_settingsinmsvs_settings.items():
 ifmsvs_tool_namein_msvs_to_msbuild_converters:
 msvs_tool=_msvs_to_msbuild_converters[msvs_tool_name]
-formsvs_setting, msvs_valueinmsvs_tool_settings.iteritems():
+formsvs_setting, msvs_valueinmsvs_tool_settings.items():
 ifmsvs_settinginmsvs_tool:
 # Invoke the translation function.
 try:
@@ -515,7 +515,7 @@ def _ValidateSettings(validators, settings, stderr):
 fortool_nameinsettings:
 iftool_nameinvalidators:
 tool_validators=validators[tool_name]
-forsetting, valueinsettings[tool_name].iteritems():
+forsetting, valueinsettings[tool_name].items():
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)

gyp/pylib/gyp/MSVSUserFile.py

@@ -91,7 +91,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 
 ifenvironmentandisinstance(environment, dict):
 env_list= ['%s="%s"'% (key, val)
-for (key,val) inenvironment.iteritems()]
+for (key,val) inenvironment.items()]
 environment=' '.join(env_list)
 else:
 environment=''
@@ -135,7 +135,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 defWriteIfChanged(self):
 """Writes the user file."""
 configs= ['Configurations']
-forconfig, specinsorted(self.configurations.iteritems()):
+forconfig, specinsorted(self.configurations.items()):
 configs.append(spec)
 
 content= ['VisualStudioUserFile',

gyp/pylib/gyp/MSVSUtil.py

@@ -235,7 +235,7 @@ def InsertLargePdbShims(target_list, target_dicts, vars):
 
 # Set up the shim to output its PDB to the same location as the final linker
 # target.
-forconfig_name, configinshim_dict.get('configurations').iteritems():
+forconfig_name, configinshim_dict.get('configurations').items():
 pdb_path=_GetPdbPath(target_dict, config_name, vars)
 
 # A few keys that we don't want to propagate.

gyp/pylib/gyp/__init__.py

@@ -209,7 +209,7 @@ def Noop(value):
 # We always want to ignore the environment when regenerating, to avoid
 # duplicate or changed flags in the environment at the time of regeneration.
 flags= ['--ignore-environment']
-forname, metadatainoptions._regeneration_metadata.iteritems():
+forname, metadatainoptions._regeneration_metadata.items():
 opt=metadata['opt']
 value=getattr(options, name)
 value_predicate=metadata['type'] =='path'andFixPathorNoop
@@ -434,7 +434,7 @@ def gyp_main(args):
 build_file_dir=os.path.abspath(os.path.dirname(build_file))
 build_file_dir_components=build_file_dir.split(os.path.sep)
 components_len=len(build_file_dir_components)
-forindexinxrange(components_len-1, -1, -1):
+forindexinrange(components_len-1, -1, -1):
 ifbuild_file_dir_components[index] =='src':
 options.depth=os.path.sep.join(build_file_dir_components)
 break

gyp/pylib/gyp/easy_xml.py

@@ -81,7 +81,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
 # Optionally in second position is a dictionary of the attributes.
 rest=specification[1:]
 ifrestandisinstance(rest[0], dict):
-forat, valinsorted(rest[0].iteritems()):
+forat, valinsorted(rest[0].items()):
 xml_parts.append(' %s="%s"'% (at, _XmlEscape(val, attr=True)))
 rest=rest[1:]
 ifrest:

gyp/pylib/gyp/generator/android.py

@@ -460,7 +460,7 @@ def WriteSourceFlags(self, spec, configs):
  Args:
  spec, configs: input from gyp.
  """
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 extracted_includes= []
 
 self.WriteLn('\n# Flags passed to both C and C++ files.')
@@ -790,7 +790,7 @@ def WriteTargetFlags(self, spec, configs, link_deps):
 static_libs, dynamic_libs, ldflags_libs=self.FilterLibraries(libraries)
 
 ifself.type!='static_library':
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 ldflags=list(config.get('ldflags', []))
 self.WriteLn('')
 self.WriteList(ldflags, 'LOCAL_LDFLAGS_%s'%configname)
@@ -839,7 +839,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, part_of_all,
 settings=spec.get('aosp_build_settings', {})
 ifsettings:
 self.WriteLn('### Set directly by aosp_build_settings.')
-fork, vinsettings.iteritems():
+fork, vinsettings.items():
 ifisinstance(v, list):
 self.WriteList(v, k)
 else:

gyp/pylib/gyp/generator/gypd.py

@@ -88,7 +88,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 ifnotoutput_fileinoutput_files:
 output_files[output_file] =input_file
 
-foroutput_file, input_fileinoutput_files.iteritems():
+foroutput_file, input_fileinoutput_files.items():
 output=open(output_file, 'w')
 pprint.pprint(data[input_file], output)
 output.close()

gyp/pylib/gyp/generator/make.py

@@ -674,7 +674,7 @@ def _ValidateSourcesForOSX(spec, all_sources):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1547,7 +1547,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 # Postbuilds expect to be run in the gyp file's directory, so insert an
 # implicit postbuild to cd to there.
 postbuilds.insert(0, gyp.common.EncodePOSIXShellList(['cd', self.path]))
-foriinxrange(len(postbuilds)):
+foriinrange(len(postbuilds)):
 ifnotpostbuilds[i].startswith('$'):
 postbuilds[i] =EscapeShellArgument(postbuilds[i])
 self.WriteLn('%s: builddir := $(abs_builddir)'%QuoteSpaces(self.output))

gyp/pylib/gyp/generator/msvs.py

@@ -451,7 +451,7 @@ def _AddCustomBuildToolForMSVS(p, spec, primary_input,
 'CommandLine': cmd,
  })
 # Add to the properties of primary input for each config.
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 p.AddFileConfig(_FixPath(primary_input),
 _ConfigFullName(config_name, c_data), tools=[tool])
 
@@ -971,7 +971,7 @@ def _ValidateSourcesForMSVSProject(spec, version):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1003,7 +1003,7 @@ def _GenerateMSVSProject(project, options, version, generator_flags):
 relative_path_of_gyp_file=gyp.common.RelativePath(gyp_path, project_dir)
 
 config_type=_GetMSVSConfigurationType(spec, project.build_file)
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config)
 
 # MSVC08 and prior version cannot handle duplicate basenames in the same
@@ -1369,10 +1369,10 @@ def _ConvertToolsToExpectedForm(tools):
  A list of Tool objects.
  """
 tool_list= []
-fortool, settingsintools.iteritems():
+fortool, settingsintools.items():
 # Collapse settings with lists.
 settings_fixed= {}
-forsetting, valueinsettings.iteritems():
+forsetting, valueinsettings.items():
 iftype(value) ==list:
 if ((tool=='VCLinkerTool'and
 setting=='AdditionalDependencies') or
@@ -1547,7 +1547,7 @@ def _IdlFilesHandledNonNatively(spec, sources):
 def_GetPrecompileRelatedFiles(spec):
 # Gather a list of precompiled header related sources.
 precompiled_related= []
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forkinprecomp_keys:
 f=config.get(k)
 iff:
@@ -1558,7 +1558,7 @@ def _GetPrecompileRelatedFiles(spec):
 def_ExcludeFilesFromBeingBuilt(p, spec, excluded_sources, excluded_idl,
 list_excluded):
 exclusions=_GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl)
-forfile_name, excluded_configsinexclusions.iteritems():
+forfile_name, excluded_configsinexclusions.items():
 if (notlist_excludedand
 len(excluded_configs) ==len(spec['configurations'])):
 # If we're not listing excluded files, then they won't appear in the
@@ -1575,7 +1575,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude excluded sources from being built.
 forfinexcluded_sources:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 precomped= [_FixPath(config.get(i, '')) foriinprecomp_keys]
 # Don't do this for ones that are precompiled header related.
 iffnotinprecomped:
@@ -1585,7 +1585,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude them now.
 forfinexcluded_idl:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 excluded_configs.append((config_name, config))
 exclusions[f] =excluded_configs
 returnexclusions
@@ -1594,7 +1594,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 def_AddToolFilesToMSVS(p, spec):
 # Add in tool files (rules).
 tool_files=OrderedSet()
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forfinconfig.get('msvs_tool_files', []):
 tool_files.add(f)
 forfintool_files:
@@ -1607,7 +1607,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
 # kind (i.e. C vs. C++) as the precompiled header source stub needs
 # to have use of precompiled headers disabled.
 extensions_excluded_from_precompile= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 source=config.get('msvs_precompiled_source')
 ifsource:
 source=_FixPath(source)
@@ -1628,7 +1628,7 @@ def DisableForSourceTree(source_tree):
 else:
 basename, extension=os.path.splitext(source)
 ifextensioninextensions_excluded_from_precompile:
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 tool=MSVSProject.Tool('VCCLCompilerTool',
  {'UsePrecompiledHeader': '0',
 'ForcedIncludeFiles': '$(NOINHERIT)'})
@@ -1679,7 +1679,7 @@ def _WriteMSVSUserFile(project_path, version, spec):
 return# Nothing to add
 # Write out the user file.
 user_file=_CreateMSVSUserFile(project_path, version, spec)
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 user_file.AddDebugSettings(_ConfigFullName(config_name, c_data),
 action, environment, working_directory)
 user_file.WriteIfChanged()
@@ -1730,7 +1730,7 @@ def _GetPathDict(root, path):
 def_DictsToFolders(base_path, bucket, flat):
 # Convert to folders recursively.
 children= []
-forfolder, contentsinbucket.iteritems():
+forfolder, contentsinbucket.items():
 iftype(contents) ==dict:
 folder_children=_DictsToFolders(os.path.join(base_path, folder),
 contents, flat)
@@ -1802,7 +1802,7 @@ def _GetPlatformOverridesOfProject(spec):
 # Prepare a dict indicating which project configurations are used for which
 # solution configurations for this target.
 config_platform_overrides= {}
-forconfig_name, cinspec['configurations'].iteritems():
+forconfig_name, cinspec['configurations'].items():
 config_fullname=_ConfigFullName(config_name, c)
 platform=c.get('msvs_target_platform', _ConfigPlatform(c))
 fixed_config_fullname='%s|%s'% (
@@ -1941,7 +1941,7 @@ def PerformBuild(data, configurations, params):
 msvs_version=params['msvs_version']
 devenv=os.path.join(msvs_version.path, 'Common7', 'IDE', 'devenv.com')
 
-forbuild_file, build_file_dictindata.iteritems():
+forbuild_file, build_file_dictindata.items():
  (build_file_root, build_file_ext) =os.path.splitext(build_file)
 ifbuild_file_ext!='.gyp':
 continue
@@ -1990,7 +1990,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 configs=set()
 forqualified_targetintarget_list:
 spec=target_dicts[qualified_target]
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 configs.add(_ConfigFullName(config_name, config))
 configs=list(configs)
 
@@ -2630,7 +2630,7 @@ def _GetConfigurationCondition(name, settings):
 
 def_GetMSBuildProjectConfigurations(configurations):
 group= ['ItemGroup', {'Label': 'ProjectConfigurations'}]
-for (name, settings) insorted(configurations.iteritems()):
+for (name, settings) insorted(configurations.items()):
 configuration, platform=_GetConfigurationAndPlatform(name, settings)
 designation='%s|%s'% (configuration, platform)
 group.append(
@@ -2700,7 +2700,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 def_GetMSBuildConfigurationDetails(spec, build_file):
 properties= {}
-forname, settingsinspec['configurations'].iteritems():
+forname, settingsinspec['configurations'].items():
 msbuild_attributes=_GetMSBuildAttributes(spec, settings, build_file)
 condition=_GetConfigurationCondition(name, settings)
 character_set=msbuild_attributes.get('CharacterSet')
@@ -2729,7 +2729,7 @@ def _GetMSBuildPropertySheets(configurations):
 user_props=r'$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'
 additional_props= {}
 props_specified=False
-forname, settingsinsorted(configurations.iteritems()):
+forname, settingsinsorted(configurations.items()):
 configuration=_GetConfigurationCondition(name, settings)
 if'msbuild_props'insettings:
 additional_props[configuration] =_FixPaths(settings['msbuild_props'])
@@ -2751,7 +2751,7 @@ def _GetMSBuildPropertySheets(configurations):
  ]
 else:
 sheets= []
-forcondition, propsinadditional_props.iteritems():
+forcondition, propsinadditional_props.items():
 import_group= [
 'ImportGroup',
  {'Label': 'PropertySheets',
@@ -2878,7 +2878,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 new_paths='$(ExecutablePath);'+';'.join(new_paths)
 
 properties= {}
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 condition=_GetConfigurationCondition(name, configuration)
 attributes=_GetMSBuildAttributes(spec, configuration, build_file)
 msbuild_settings=configuration['finalized_msbuild_settings']
@@ -2903,7 +2903,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 _AddConditionalProperty(properties, condition, 'ExecutablePath',
 new_paths)
 tool_settings=msbuild_settings.get('', {})
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild('', name, value)
 _AddConditionalProperty(properties, condition, name, formatted_value)
 return_GetMSBuildPropertyGroup(spec, None, properties)
@@ -2972,7 +2972,7 @@ def GetEdges(node):
 # NOTE: reverse(topsort(DAG)) = topsort(reverse_edges(DAG))
 fornameinreversed(properties_ordered):
 values=properties[name]
-forvalue, conditionsinsorted(values.iteritems()):
+forvalue, conditionsinsorted(values.items()):
 iflen(conditions) ==num_configurations:
 # If the value is the same all configurations,
 # just add one unconditional entry.
@@ -2985,18 +2985,18 @@ def GetEdges(node):
 
 def_GetMSBuildToolSettingsSections(spec, configurations):
 groups= []
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 msbuild_settings=configuration['finalized_msbuild_settings']
 group= ['ItemDefinitionGroup',
  {'Condition': _GetConfigurationCondition(name, configuration)}
  ]
-fortool_name, tool_settingsinsorted(msbuild_settings.iteritems()):
+fortool_name, tool_settingsinsorted(msbuild_settings.items()):
 # Skip the tool named '' which is a holder of global settings handled
 # by _GetMSBuildConfigurationGlobalProperties.
 iftool_name:
 iftool_settings:
 tool= [tool_name]
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild(tool_name, name,
 value)
 tool.append([name, formatted_value])
@@ -3196,7 +3196,7 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
  {'Condition': condition},
 'true'])
 # Add precompile if needed
-forconfig_name, configurationinspec['configurations'].iteritems():
+forconfig_name, configurationinspec['configurations'].items():
 precompiled_source=configuration.get('msvs_precompiled_source', '')
 ifprecompiled_source!='':
 precompiled_source=_FixPath(precompiled_source)
@@ -3436,7 +3436,7 @@ def _GenerateActionsForMSBuild(spec, actions_to_add):
  """
 sources_handled_by_action=OrderedSet()
 actions_spec= []
-forprimary_input, actionsinactions_to_add.iteritems():
+forprimary_input, actionsinactions_to_add.items():
 inputs=OrderedSet()
 outputs=OrderedSet()
 descriptions= []

gyp/PRESUBMIT.py

@@ -76,8 +76,7 @@
 def_LicenseHeader(input_api):
 # Accept any year number from 2009 to the current year.
 current_year=int(input_api.time.strftime('%Y'))
-allowed_years= (str(s) forsinreversed(xrange(2009, current_year+1)))
-
+allowed_years= (str(s) forsinreversed(range(2009, current_year+1)))
 years_re='('+'|'.join(allowed_years) +')'
 
 # The (c) is deprecated, but tolerate it until it's removed from all files.

gyp/pylib/gyp/MSVSSettings.py

@@ -435,7 +435,7 @@ def ConvertVCMacrosToMSBuild(s):
 '$(PlatformName)': '$(Platform)',
 '$(SafeInputName)': '%(Filename)',
  }
-forold, newinreplace_map.iteritems():
+forold, newinreplace_map.items():
 s=s.replace(old, new)
 s=FixVCMacroSlashes(s)
 returns
@@ -455,10 +455,10 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  dictionaries of settings and their values.
  """
 msbuild_settings= {}
-formsvs_tool_name, msvs_tool_settingsinmsvs_settings.iteritems():
+formsvs_tool_name, msvs_tool_settingsinmsvs_settings.items():
 ifmsvs_tool_namein_msvs_to_msbuild_converters:
 msvs_tool=_msvs_to_msbuild_converters[msvs_tool_name]
-formsvs_setting, msvs_valueinmsvs_tool_settings.iteritems():
+formsvs_setting, msvs_valueinmsvs_tool_settings.items():
 ifmsvs_settinginmsvs_tool:
 # Invoke the translation function.
 try:
@@ -515,7 +515,7 @@ def _ValidateSettings(validators, settings, stderr):
 fortool_nameinsettings:
 iftool_nameinvalidators:
 tool_validators=validators[tool_name]
-forsetting, valueinsettings[tool_name].iteritems():
+forsetting, valueinsettings[tool_name].items():
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)

gyp/pylib/gyp/MSVSUserFile.py

@@ -91,7 +91,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 
 ifenvironmentandisinstance(environment, dict):
 env_list= ['%s="%s"'% (key, val)
-for (key,val) inenvironment.iteritems()]
+for (key,val) inenvironment.items()]
 environment=' '.join(env_list)
 else:
 environment=''
@@ -135,7 +135,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 defWriteIfChanged(self):
 """Writes the user file."""
 configs= ['Configurations']
-forconfig, specinsorted(self.configurations.iteritems()):
+forconfig, specinsorted(self.configurations.items()):
 configs.append(spec)
 
 content= ['VisualStudioUserFile',

gyp/pylib/gyp/MSVSUtil.py

@@ -235,7 +235,7 @@ def InsertLargePdbShims(target_list, target_dicts, vars):
 
 # Set up the shim to output its PDB to the same location as the final linker
 # target.
-forconfig_name, configinshim_dict.get('configurations').iteritems():
+forconfig_name, configinshim_dict.get('configurations').items():
 pdb_path=_GetPdbPath(target_dict, config_name, vars)
 
 # A few keys that we don't want to propagate.

gyp/pylib/gyp/__init__.py

@@ -209,7 +209,7 @@ def Noop(value):
 # We always want to ignore the environment when regenerating, to avoid
 # duplicate or changed flags in the environment at the time of regeneration.
 flags= ['--ignore-environment']
-forname, metadatainoptions._regeneration_metadata.iteritems():
+forname, metadatainoptions._regeneration_metadata.items():
 opt=metadata['opt']
 value=getattr(options, name)
 value_predicate=metadata['type'] =='path'andFixPathorNoop
@@ -434,7 +434,7 @@ def gyp_main(args):
 build_file_dir=os.path.abspath(os.path.dirname(build_file))
 build_file_dir_components=build_file_dir.split(os.path.sep)
 components_len=len(build_file_dir_components)
-forindexinxrange(components_len-1, -1, -1):
+forindexinrange(components_len-1, -1, -1):
 ifbuild_file_dir_components[index] =='src':
 options.depth=os.path.sep.join(build_file_dir_components)
 break

gyp/pylib/gyp/easy_xml.py

@@ -81,7 +81,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
 # Optionally in second position is a dictionary of the attributes.
 rest=specification[1:]
 ifrestandisinstance(rest[0], dict):
-forat, valinsorted(rest[0].iteritems()):
+forat, valinsorted(rest[0].items()):
 xml_parts.append(' %s="%s"'% (at, _XmlEscape(val, attr=True)))
 rest=rest[1:]
 ifrest:

gyp/pylib/gyp/generator/android.py

@@ -460,7 +460,7 @@ def WriteSourceFlags(self, spec, configs):
  Args:
  spec, configs: input from gyp.
  """
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 extracted_includes= []
 
 self.WriteLn('\n# Flags passed to both C and C++ files.')
@@ -790,7 +790,7 @@ def WriteTargetFlags(self, spec, configs, link_deps):
 static_libs, dynamic_libs, ldflags_libs=self.FilterLibraries(libraries)
 
 ifself.type!='static_library':
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 ldflags=list(config.get('ldflags', []))
 self.WriteLn('')
 self.WriteList(ldflags, 'LOCAL_LDFLAGS_%s'%configname)
@@ -839,7 +839,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, part_of_all,
 settings=spec.get('aosp_build_settings', {})
 ifsettings:
 self.WriteLn('### Set directly by aosp_build_settings.')
-fork, vinsettings.iteritems():
+fork, vinsettings.items():
 ifisinstance(v, list):
 self.WriteList(v, k)
 else:

gyp/pylib/gyp/generator/gypd.py

@@ -88,7 +88,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 ifnotoutput_fileinoutput_files:
 output_files[output_file] =input_file
 
-foroutput_file, input_fileinoutput_files.iteritems():
+foroutput_file, input_fileinoutput_files.items():
 output=open(output_file, 'w')
 pprint.pprint(data[input_file], output)
 output.close()

gyp/pylib/gyp/generator/make.py

@@ -674,7 +674,7 @@ def _ValidateSourcesForOSX(spec, all_sources):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1547,7 +1547,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 # Postbuilds expect to be run in the gyp file's directory, so insert an
 # implicit postbuild to cd to there.
 postbuilds.insert(0, gyp.common.EncodePOSIXShellList(['cd', self.path]))
-foriinxrange(len(postbuilds)):
+foriinrange(len(postbuilds)):
 ifnotpostbuilds[i].startswith('$'):
 postbuilds[i] =EscapeShellArgument(postbuilds[i])
 self.WriteLn('%s: builddir := $(abs_builddir)'%QuoteSpaces(self.output))

gyp/pylib/gyp/generator/msvs.py

@@ -451,7 +451,7 @@ def _AddCustomBuildToolForMSVS(p, spec, primary_input,
 'CommandLine': cmd,
  })
 # Add to the properties of primary input for each config.
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 p.AddFileConfig(_FixPath(primary_input),
 _ConfigFullName(config_name, c_data), tools=[tool])
 
@@ -971,7 +971,7 @@ def _ValidateSourcesForMSVSProject(spec, version):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1003,7 +1003,7 @@ def _GenerateMSVSProject(project, options, version, generator_flags):
 relative_path_of_gyp_file=gyp.common.RelativePath(gyp_path, project_dir)
 
 config_type=_GetMSVSConfigurationType(spec, project.build_file)
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config)
 
 # MSVC08 and prior version cannot handle duplicate basenames in the same
@@ -1369,10 +1369,10 @@ def _ConvertToolsToExpectedForm(tools):
  A list of Tool objects.
  """
 tool_list= []
-fortool, settingsintools.iteritems():
+fortool, settingsintools.items():
 # Collapse settings with lists.
 settings_fixed= {}
-forsetting, valueinsettings.iteritems():
+forsetting, valueinsettings.items():
 iftype(value) ==list:
 if ((tool=='VCLinkerTool'and
 setting=='AdditionalDependencies') or
@@ -1547,7 +1547,7 @@ def _IdlFilesHandledNonNatively(spec, sources):
 def_GetPrecompileRelatedFiles(spec):
 # Gather a list of precompiled header related sources.
 precompiled_related= []
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forkinprecomp_keys:
 f=config.get(k)
 iff:
@@ -1558,7 +1558,7 @@ def _GetPrecompileRelatedFiles(spec):
 def_ExcludeFilesFromBeingBuilt(p, spec, excluded_sources, excluded_idl,
 list_excluded):
 exclusions=_GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl)
-forfile_name, excluded_configsinexclusions.iteritems():
+forfile_name, excluded_configsinexclusions.items():
 if (notlist_excludedand
 len(excluded_configs) ==len(spec['configurations'])):
 # If we're not listing excluded files, then they won't appear in the
@@ -1575,7 +1575,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude excluded sources from being built.
 forfinexcluded_sources:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 precomped= [_FixPath(config.get(i, '')) foriinprecomp_keys]
 # Don't do this for ones that are precompiled header related.
 iffnotinprecomped:
@@ -1585,7 +1585,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude them now.
 forfinexcluded_idl:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 excluded_configs.append((config_name, config))
 exclusions[f] =excluded_configs
 returnexclusions
@@ -1594,7 +1594,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 def_AddToolFilesToMSVS(p, spec):
 # Add in tool files (rules).
 tool_files=OrderedSet()
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forfinconfig.get('msvs_tool_files', []):
 tool_files.add(f)
 forfintool_files:
@@ -1607,7 +1607,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
 # kind (i.e. C vs. C++) as the precompiled header source stub needs
 # to have use of precompiled headers disabled.
 extensions_excluded_from_precompile= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 source=config.get('msvs_precompiled_source')
 ifsource:
 source=_FixPath(source)
@@ -1628,7 +1628,7 @@ def DisableForSourceTree(source_tree):
 else:
 basename, extension=os.path.splitext(source)
 ifextensioninextensions_excluded_from_precompile:
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 tool=MSVSProject.Tool('VCCLCompilerTool',
  {'UsePrecompiledHeader': '0',
 'ForcedIncludeFiles': '$(NOINHERIT)'})
@@ -1679,7 +1679,7 @@ def _WriteMSVSUserFile(project_path, version, spec):
 return# Nothing to add
 # Write out the user file.
 user_file=_CreateMSVSUserFile(project_path, version, spec)
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 user_file.AddDebugSettings(_ConfigFullName(config_name, c_data),
 action, environment, working_directory)
 user_file.WriteIfChanged()
@@ -1730,7 +1730,7 @@ def _GetPathDict(root, path):
 def_DictsToFolders(base_path, bucket, flat):
 # Convert to folders recursively.
 children= []
-forfolder, contentsinbucket.iteritems():
+forfolder, contentsinbucket.items():
 iftype(contents) ==dict:
 folder_children=_DictsToFolders(os.path.join(base_path, folder),
 contents, flat)
@@ -1802,7 +1802,7 @@ def _GetPlatformOverridesOfProject(spec):
 # Prepare a dict indicating which project configurations are used for which
 # solution configurations for this target.
 config_platform_overrides= {}
-forconfig_name, cinspec['configurations'].iteritems():
+forconfig_name, cinspec['configurations'].items():
 config_fullname=_ConfigFullName(config_name, c)
 platform=c.get('msvs_target_platform', _ConfigPlatform(c))
 fixed_config_fullname='%s|%s'% (
@@ -1941,7 +1941,7 @@ def PerformBuild(data, configurations, params):
 msvs_version=params['msvs_version']
 devenv=os.path.join(msvs_version.path, 'Common7', 'IDE', 'devenv.com')
 
-forbuild_file, build_file_dictindata.iteritems():
+forbuild_file, build_file_dictindata.items():
  (build_file_root, build_file_ext) =os.path.splitext(build_file)
 ifbuild_file_ext!='.gyp':
 continue
@@ -1990,7 +1990,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 configs=set()
 forqualified_targetintarget_list:
 spec=target_dicts[qualified_target]
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 configs.add(_ConfigFullName(config_name, config))
 configs=list(configs)
 
@@ -2630,7 +2630,7 @@ def _GetConfigurationCondition(name, settings):
 
 def_GetMSBuildProjectConfigurations(configurations):
 group= ['ItemGroup', {'Label': 'ProjectConfigurations'}]
-for (name, settings) insorted(configurations.iteritems()):
+for (name, settings) insorted(configurations.items()):
 configuration, platform=_GetConfigurationAndPlatform(name, settings)
 designation='%s|%s'% (configuration, platform)
 group.append(
@@ -2700,7 +2700,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 def_GetMSBuildConfigurationDetails(spec, build_file):
 properties= {}
-forname, settingsinspec['configurations'].iteritems():
+forname, settingsinspec['configurations'].items():
 msbuild_attributes=_GetMSBuildAttributes(spec, settings, build_file)
 condition=_GetConfigurationCondition(name, settings)
 character_set=msbuild_attributes.get('CharacterSet')
@@ -2729,7 +2729,7 @@ def _GetMSBuildPropertySheets(configurations):
 user_props=r'$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'
 additional_props= {}
 props_specified=False
-forname, settingsinsorted(configurations.iteritems()):
+forname, settingsinsorted(configurations.items()):
 configuration=_GetConfigurationCondition(name, settings)
 if'msbuild_props'insettings:
 additional_props[configuration] =_FixPaths(settings['msbuild_props'])
@@ -2751,7 +2751,7 @@ def _GetMSBuildPropertySheets(configurations):
  ]
 else:
 sheets= []
-forcondition, propsinadditional_props.iteritems():
+forcondition, propsinadditional_props.items():
 import_group= [
 'ImportGroup',
  {'Label': 'PropertySheets',
@@ -2878,7 +2878,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 new_paths='$(ExecutablePath);'+';'.join(new_paths)
 
 properties= {}
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 condition=_GetConfigurationCondition(name, configuration)
 attributes=_GetMSBuildAttributes(spec, configuration, build_file)
 msbuild_settings=configuration['finalized_msbuild_settings']
@@ -2903,7 +2903,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 _AddConditionalProperty(properties, condition, 'ExecutablePath',
 new_paths)
 tool_settings=msbuild_settings.get('', {})
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild('', name, value)
 _AddConditionalProperty(properties, condition, name, formatted_value)
 return_GetMSBuildPropertyGroup(spec, None, properties)
@@ -2972,7 +2972,7 @@ def GetEdges(node):
 # NOTE: reverse(topsort(DAG)) = topsort(reverse_edges(DAG))
 fornameinreversed(properties_ordered):
 values=properties[name]
-forvalue, conditionsinsorted(values.iteritems()):
+forvalue, conditionsinsorted(values.items()):
 iflen(conditions) ==num_configurations:
 # If the value is the same all configurations,
 # just add one unconditional entry.
@@ -2985,18 +2985,18 @@ def GetEdges(node):
 
 def_GetMSBuildToolSettingsSections(spec, configurations):
 groups= []
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 msbuild_settings=configuration['finalized_msbuild_settings']
 group= ['ItemDefinitionGroup',
  {'Condition': _GetConfigurationCondition(name, configuration)}
  ]
-fortool_name, tool_settingsinsorted(msbuild_settings.iteritems()):
+fortool_name, tool_settingsinsorted(msbuild_settings.items()):
 # Skip the tool named '' which is a holder of global settings handled
 # by _GetMSBuildConfigurationGlobalProperties.
 iftool_name:
 iftool_settings:
 tool= [tool_name]
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild(tool_name, name,
 value)
 tool.append([name, formatted_value])
@@ -3196,7 +3196,7 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
  {'Condition': condition},
 'true'])
 # Add precompile if needed
-forconfig_name, configurationinspec['configurations'].iteritems():
+forconfig_name, configurationinspec['configurations'].items():
 precompiled_source=configuration.get('msvs_precompiled_source', '')
 ifprecompiled_source!='':
 precompiled_source=_FixPath(precompiled_source)
@@ -3436,7 +3436,7 @@ def _GenerateActionsForMSBuild(spec, actions_to_add):
  """
 sources_handled_by_action=OrderedSet()
 actions_spec= []
-forprimary_input, actionsinactions_to_add.iteritems():
+forprimary_input, actionsinactions_to_add.items():
 inputs=OrderedSet()
 outputs=OrderedSet()
 descriptions= []

gyp/PRESUBMIT.py

@@ -76,8 +76,7 @@
 def_LicenseHeader(input_api):
 # Accept any year number from 2009 to the current year.
 current_year=int(input_api.time.strftime('%Y'))
-allowed_years= (str(s) forsinreversed(xrange(2009, current_year+1)))
-
+allowed_years= (str(s) forsinreversed(range(2009, current_year+1)))
 years_re='('+'|'.join(allowed_years) +')'
 
 # The (c) is deprecated, but tolerate it until it's removed from all files.

gyp/pylib/gyp/MSVSSettings.py

@@ -435,7 +435,7 @@ def ConvertVCMacrosToMSBuild(s):
 '$(PlatformName)': '$(Platform)',
 '$(SafeInputName)': '%(Filename)',
  }
-forold, newinreplace_map.iteritems():
+forold, newinreplace_map.items():
 s=s.replace(old, new)
 s=FixVCMacroSlashes(s)
 returns
@@ -455,10 +455,10 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  dictionaries of settings and their values.
  """
 msbuild_settings= {}
-formsvs_tool_name, msvs_tool_settingsinmsvs_settings.iteritems():
+formsvs_tool_name, msvs_tool_settingsinmsvs_settings.items():
 ifmsvs_tool_namein_msvs_to_msbuild_converters:
 msvs_tool=_msvs_to_msbuild_converters[msvs_tool_name]
-formsvs_setting, msvs_valueinmsvs_tool_settings.iteritems():
+formsvs_setting, msvs_valueinmsvs_tool_settings.items():
 ifmsvs_settinginmsvs_tool:
 # Invoke the translation function.
 try:
@@ -515,7 +515,7 @@ def _ValidateSettings(validators, settings, stderr):
 fortool_nameinsettings:
 iftool_nameinvalidators:
 tool_validators=validators[tool_name]
-forsetting, valueinsettings[tool_name].iteritems():
+forsetting, valueinsettings[tool_name].items():
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)

gyp/pylib/gyp/MSVSUserFile.py

@@ -91,7 +91,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 
 ifenvironmentandisinstance(environment, dict):
 env_list= ['%s="%s"'% (key, val)
-for (key,val) inenvironment.iteritems()]
+for (key,val) inenvironment.items()]
 environment=' '.join(env_list)
 else:
 environment=''
@@ -135,7 +135,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 defWriteIfChanged(self):
 """Writes the user file."""
 configs= ['Configurations']
-forconfig, specinsorted(self.configurations.iteritems()):
+forconfig, specinsorted(self.configurations.items()):
 configs.append(spec)
 
 content= ['VisualStudioUserFile',

gyp/pylib/gyp/MSVSUtil.py

@@ -235,7 +235,7 @@ def InsertLargePdbShims(target_list, target_dicts, vars):
 
 # Set up the shim to output its PDB to the same location as the final linker
 # target.
-forconfig_name, configinshim_dict.get('configurations').iteritems():
+forconfig_name, configinshim_dict.get('configurations').items():
 pdb_path=_GetPdbPath(target_dict, config_name, vars)
 
 # A few keys that we don't want to propagate.

gyp/pylib/gyp/__init__.py

@@ -209,7 +209,7 @@ def Noop(value):
 # We always want to ignore the environment when regenerating, to avoid
 # duplicate or changed flags in the environment at the time of regeneration.
 flags= ['--ignore-environment']
-forname, metadatainoptions._regeneration_metadata.iteritems():
+forname, metadatainoptions._regeneration_metadata.items():
 opt=metadata['opt']
 value=getattr(options, name)
 value_predicate=metadata['type'] =='path'andFixPathorNoop
@@ -434,7 +434,7 @@ def gyp_main(args):
 build_file_dir=os.path.abspath(os.path.dirname(build_file))
 build_file_dir_components=build_file_dir.split(os.path.sep)
 components_len=len(build_file_dir_components)
-forindexinxrange(components_len-1, -1, -1):
+forindexinrange(components_len-1, -1, -1):
 ifbuild_file_dir_components[index] =='src':
 options.depth=os.path.sep.join(build_file_dir_components)
 break

gyp/pylib/gyp/easy_xml.py

@@ -81,7 +81,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
 # Optionally in second position is a dictionary of the attributes.
 rest=specification[1:]
 ifrestandisinstance(rest[0], dict):
-forat, valinsorted(rest[0].iteritems()):
+forat, valinsorted(rest[0].items()):
 xml_parts.append(' %s="%s"'% (at, _XmlEscape(val, attr=True)))
 rest=rest[1:]
 ifrest:

gyp/pylib/gyp/generator/android.py

@@ -460,7 +460,7 @@ def WriteSourceFlags(self, spec, configs):
  Args:
  spec, configs: input from gyp.
  """
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 extracted_includes= []
 
 self.WriteLn('\n# Flags passed to both C and C++ files.')
@@ -790,7 +790,7 @@ def WriteTargetFlags(self, spec, configs, link_deps):
 static_libs, dynamic_libs, ldflags_libs=self.FilterLibraries(libraries)
 
 ifself.type!='static_library':
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 ldflags=list(config.get('ldflags', []))
 self.WriteLn('')
 self.WriteList(ldflags, 'LOCAL_LDFLAGS_%s'%configname)
@@ -839,7 +839,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, part_of_all,
 settings=spec.get('aosp_build_settings', {})
 ifsettings:
 self.WriteLn('### Set directly by aosp_build_settings.')
-fork, vinsettings.iteritems():
+fork, vinsettings.items():
 ifisinstance(v, list):
 self.WriteList(v, k)
 else:

gyp/pylib/gyp/generator/gypd.py

@@ -88,7 +88,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 ifnotoutput_fileinoutput_files:
 output_files[output_file] =input_file
 
-foroutput_file, input_fileinoutput_files.iteritems():
+foroutput_file, input_fileinoutput_files.items():
 output=open(output_file, 'w')
 pprint.pprint(data[input_file], output)
 output.close()

gyp/pylib/gyp/generator/make.py

@@ -674,7 +674,7 @@ def _ValidateSourcesForOSX(spec, all_sources):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1547,7 +1547,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 # Postbuilds expect to be run in the gyp file's directory, so insert an
 # implicit postbuild to cd to there.
 postbuilds.insert(0, gyp.common.EncodePOSIXShellList(['cd', self.path]))
-foriinxrange(len(postbuilds)):
+foriinrange(len(postbuilds)):
 ifnotpostbuilds[i].startswith('$'):
 postbuilds[i] =EscapeShellArgument(postbuilds[i])
 self.WriteLn('%s: builddir := $(abs_builddir)'%QuoteSpaces(self.output))

gyp/pylib/gyp/generator/msvs.py

@@ -451,7 +451,7 @@ def _AddCustomBuildToolForMSVS(p, spec, primary_input,
 'CommandLine': cmd,
  })
 # Add to the properties of primary input for each config.
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 p.AddFileConfig(_FixPath(primary_input),
 _ConfigFullName(config_name, c_data), tools=[tool])
 
@@ -971,7 +971,7 @@ def _ValidateSourcesForMSVSProject(spec, version):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1003,7 +1003,7 @@ def _GenerateMSVSProject(project, options, version, generator_flags):
 relative_path_of_gyp_file=gyp.common.RelativePath(gyp_path, project_dir)
 
 config_type=_GetMSVSConfigurationType(spec, project.build_file)
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config)
 
 # MSVC08 and prior version cannot handle duplicate basenames in the same
@@ -1369,10 +1369,10 @@ def _ConvertToolsToExpectedForm(tools):
  A list of Tool objects.
  """
 tool_list= []
-fortool, settingsintools.iteritems():
+fortool, settingsintools.items():
 # Collapse settings with lists.
 settings_fixed= {}
-forsetting, valueinsettings.iteritems():
+forsetting, valueinsettings.items():
 iftype(value) ==list:
 if ((tool=='VCLinkerTool'and
 setting=='AdditionalDependencies') or
@@ -1547,7 +1547,7 @@ def _IdlFilesHandledNonNatively(spec, sources):
 def_GetPrecompileRelatedFiles(spec):
 # Gather a list of precompiled header related sources.
 precompiled_related= []
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forkinprecomp_keys:
 f=config.get(k)
 iff:
@@ -1558,7 +1558,7 @@ def _GetPrecompileRelatedFiles(spec):
 def_ExcludeFilesFromBeingBuilt(p, spec, excluded_sources, excluded_idl,
 list_excluded):
 exclusions=_GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl)
-forfile_name, excluded_configsinexclusions.iteritems():
+forfile_name, excluded_configsinexclusions.items():
 if (notlist_excludedand
 len(excluded_configs) ==len(spec['configurations'])):
 # If we're not listing excluded files, then they won't appear in the
@@ -1575,7 +1575,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude excluded sources from being built.
 forfinexcluded_sources:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 precomped= [_FixPath(config.get(i, '')) foriinprecomp_keys]
 # Don't do this for ones that are precompiled header related.
 iffnotinprecomped:
@@ -1585,7 +1585,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude them now.
 forfinexcluded_idl:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 excluded_configs.append((config_name, config))
 exclusions[f] =excluded_configs
 returnexclusions
@@ -1594,7 +1594,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 def_AddToolFilesToMSVS(p, spec):
 # Add in tool files (rules).
 tool_files=OrderedSet()
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forfinconfig.get('msvs_tool_files', []):
 tool_files.add(f)
 forfintool_files:
@@ -1607,7 +1607,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
 # kind (i.e. C vs. C++) as the precompiled header source stub needs
 # to have use of precompiled headers disabled.
 extensions_excluded_from_precompile= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 source=config.get('msvs_precompiled_source')
 ifsource:
 source=_FixPath(source)
@@ -1628,7 +1628,7 @@ def DisableForSourceTree(source_tree):
 else:
 basename, extension=os.path.splitext(source)
 ifextensioninextensions_excluded_from_precompile:
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 tool=MSVSProject.Tool('VCCLCompilerTool',
  {'UsePrecompiledHeader': '0',
 'ForcedIncludeFiles': '$(NOINHERIT)'})
@@ -1679,7 +1679,7 @@ def _WriteMSVSUserFile(project_path, version, spec):
 return# Nothing to add
 # Write out the user file.
 user_file=_CreateMSVSUserFile(project_path, version, spec)
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 user_file.AddDebugSettings(_ConfigFullName(config_name, c_data),
 action, environment, working_directory)
 user_file.WriteIfChanged()
@@ -1730,7 +1730,7 @@ def _GetPathDict(root, path):
 def_DictsToFolders(base_path, bucket, flat):
 # Convert to folders recursively.
 children= []
-forfolder, contentsinbucket.iteritems():
+forfolder, contentsinbucket.items():
 iftype(contents) ==dict:
 folder_children=_DictsToFolders(os.path.join(base_path, folder),
 contents, flat)
@@ -1802,7 +1802,7 @@ def _GetPlatformOverridesOfProject(spec):
 # Prepare a dict indicating which project configurations are used for which
 # solution configurations for this target.
 config_platform_overrides= {}
-forconfig_name, cinspec['configurations'].iteritems():
+forconfig_name, cinspec['configurations'].items():
 config_fullname=_ConfigFullName(config_name, c)
 platform=c.get('msvs_target_platform', _ConfigPlatform(c))
 fixed_config_fullname='%s|%s'% (
@@ -1941,7 +1941,7 @@ def PerformBuild(data, configurations, params):
 msvs_version=params['msvs_version']
 devenv=os.path.join(msvs_version.path, 'Common7', 'IDE', 'devenv.com')
 
-forbuild_file, build_file_dictindata.iteritems():
+forbuild_file, build_file_dictindata.items():
  (build_file_root, build_file_ext) =os.path.splitext(build_file)
 ifbuild_file_ext!='.gyp':
 continue
@@ -1990,7 +1990,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 configs=set()
 forqualified_targetintarget_list:
 spec=target_dicts[qualified_target]
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 configs.add(_ConfigFullName(config_name, config))
 configs=list(configs)
 
@@ -2630,7 +2630,7 @@ def _GetConfigurationCondition(name, settings):
 
 def_GetMSBuildProjectConfigurations(configurations):
 group= ['ItemGroup', {'Label': 'ProjectConfigurations'}]
-for (name, settings) insorted(configurations.iteritems()):
+for (name, settings) insorted(configurations.items()):
 configuration, platform=_GetConfigurationAndPlatform(name, settings)
 designation='%s|%s'% (configuration, platform)
 group.append(
@@ -2700,7 +2700,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 def_GetMSBuildConfigurationDetails(spec, build_file):
 properties= {}
-forname, settingsinspec['configurations'].iteritems():
+forname, settingsinspec['configurations'].items():
 msbuild_attributes=_GetMSBuildAttributes(spec, settings, build_file)
 condition=_GetConfigurationCondition(name, settings)
 character_set=msbuild_attributes.get('CharacterSet')
@@ -2729,7 +2729,7 @@ def _GetMSBuildPropertySheets(configurations):
 user_props=r'$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'
 additional_props= {}
 props_specified=False
-forname, settingsinsorted(configurations.iteritems()):
+forname, settingsinsorted(configurations.items()):
 configuration=_GetConfigurationCondition(name, settings)
 if'msbuild_props'insettings:
 additional_props[configuration] =_FixPaths(settings['msbuild_props'])
@@ -2751,7 +2751,7 @@ def _GetMSBuildPropertySheets(configurations):
  ]
 else:
 sheets= []
-forcondition, propsinadditional_props.iteritems():
+forcondition, propsinadditional_props.items():
 import_group= [
 'ImportGroup',
  {'Label': 'PropertySheets',
@@ -2878,7 +2878,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 new_paths='$(ExecutablePath);'+';'.join(new_paths)
 
 properties= {}
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 condition=_GetConfigurationCondition(name, configuration)
 attributes=_GetMSBuildAttributes(spec, configuration, build_file)
 msbuild_settings=configuration['finalized_msbuild_settings']
@@ -2903,7 +2903,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 _AddConditionalProperty(properties, condition, 'ExecutablePath',
 new_paths)
 tool_settings=msbuild_settings.get('', {})
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild('', name, value)
 _AddConditionalProperty(properties, condition, name, formatted_value)
 return_GetMSBuildPropertyGroup(spec, None, properties)
@@ -2972,7 +2972,7 @@ def GetEdges(node):
 # NOTE: reverse(topsort(DAG)) = topsort(reverse_edges(DAG))
 fornameinreversed(properties_ordered):
 values=properties[name]
-forvalue, conditionsinsorted(values.iteritems()):
+forvalue, conditionsinsorted(values.items()):
 iflen(conditions) ==num_configurations:
 # If the value is the same all configurations,
 # just add one unconditional entry.
@@ -2985,18 +2985,18 @@ def GetEdges(node):
 
 def_GetMSBuildToolSettingsSections(spec, configurations):
 groups= []
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 msbuild_settings=configuration['finalized_msbuild_settings']
 group= ['ItemDefinitionGroup',
  {'Condition': _GetConfigurationCondition(name, configuration)}
  ]
-fortool_name, tool_settingsinsorted(msbuild_settings.iteritems()):
+fortool_name, tool_settingsinsorted(msbuild_settings.items()):
 # Skip the tool named '' which is a holder of global settings handled
 # by _GetMSBuildConfigurationGlobalProperties.
 iftool_name:
 iftool_settings:
 tool= [tool_name]
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild(tool_name, name,
 value)
 tool.append([name, formatted_value])
@@ -3196,7 +3196,7 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
  {'Condition': condition},
 'true'])
 # Add precompile if needed
-forconfig_name, configurationinspec['configurations'].iteritems():
+forconfig_name, configurationinspec['configurations'].items():
 precompiled_source=configuration.get('msvs_precompiled_source', '')
 ifprecompiled_source!='':
 precompiled_source=_FixPath(precompiled_source)
@@ -3436,7 +3436,7 @@ def _GenerateActionsForMSBuild(spec, actions_to_add):
  """
 sources_handled_by_action=OrderedSet()
 actions_spec= []
-forprimary_input, actionsinactions_to_add.iteritems():
+forprimary_input, actionsinactions_to_add.items():
 inputs=OrderedSet()
 outputs=OrderedSet()
 descriptions= []

gyp/PRESUBMIT.py

@@ -76,8 +76,7 @@
 def_LicenseHeader(input_api):
 # Accept any year number from 2009 to the current year.
 current_year=int(input_api.time.strftime('%Y'))
-allowed_years= (str(s) forsinreversed(xrange(2009, current_year+1)))
-
+allowed_years= (str(s) forsinreversed(range(2009, current_year+1)))
 years_re='('+'|'.join(allowed_years) +')'
 
 # The (c) is deprecated, but tolerate it until it's removed from all files.

gyp/pylib/gyp/MSVSSettings.py

@@ -435,7 +435,7 @@ def ConvertVCMacrosToMSBuild(s):
 '$(PlatformName)': '$(Platform)',
 '$(SafeInputName)': '%(Filename)',
  }
-forold, newinreplace_map.iteritems():
+forold, newinreplace_map.items():
 s=s.replace(old, new)
 s=FixVCMacroSlashes(s)
 returns
@@ -455,10 +455,10 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  dictionaries of settings and their values.
  """
 msbuild_settings= {}
-formsvs_tool_name, msvs_tool_settingsinmsvs_settings.iteritems():
+formsvs_tool_name, msvs_tool_settingsinmsvs_settings.items():
 ifmsvs_tool_namein_msvs_to_msbuild_converters:
 msvs_tool=_msvs_to_msbuild_converters[msvs_tool_name]
-formsvs_setting, msvs_valueinmsvs_tool_settings.iteritems():
+formsvs_setting, msvs_valueinmsvs_tool_settings.items():
 ifmsvs_settinginmsvs_tool:
 # Invoke the translation function.
 try:
@@ -515,7 +515,7 @@ def _ValidateSettings(validators, settings, stderr):
 fortool_nameinsettings:
 iftool_nameinvalidators:
 tool_validators=validators[tool_name]
-forsetting, valueinsettings[tool_name].iteritems():
+forsetting, valueinsettings[tool_name].items():
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)

gyp/pylib/gyp/MSVSUserFile.py

@@ -91,7 +91,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 
 ifenvironmentandisinstance(environment, dict):
 env_list= ['%s="%s"'% (key, val)
-for (key,val) inenvironment.iteritems()]
+for (key,val) inenvironment.items()]
 environment=' '.join(env_list)
 else:
 environment=''
@@ -135,7 +135,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 defWriteIfChanged(self):
 """Writes the user file."""
 configs= ['Configurations']
-forconfig, specinsorted(self.configurations.iteritems()):
+forconfig, specinsorted(self.configurations.items()):
 configs.append(spec)
 
 content= ['VisualStudioUserFile',

gyp/pylib/gyp/MSVSUtil.py

@@ -235,7 +235,7 @@ def InsertLargePdbShims(target_list, target_dicts, vars):
 
 # Set up the shim to output its PDB to the same location as the final linker
 # target.
-forconfig_name, configinshim_dict.get('configurations').iteritems():
+forconfig_name, configinshim_dict.get('configurations').items():
 pdb_path=_GetPdbPath(target_dict, config_name, vars)
 
 # A few keys that we don't want to propagate.

gyp/pylib/gyp/__init__.py

@@ -209,7 +209,7 @@ def Noop(value):
 # We always want to ignore the environment when regenerating, to avoid
 # duplicate or changed flags in the environment at the time of regeneration.
 flags= ['--ignore-environment']
-forname, metadatainoptions._regeneration_metadata.iteritems():
+forname, metadatainoptions._regeneration_metadata.items():
 opt=metadata['opt']
 value=getattr(options, name)
 value_predicate=metadata['type'] =='path'andFixPathorNoop
@@ -434,7 +434,7 @@ def gyp_main(args):
 build_file_dir=os.path.abspath(os.path.dirname(build_file))
 build_file_dir_components=build_file_dir.split(os.path.sep)
 components_len=len(build_file_dir_components)
-forindexinxrange(components_len-1, -1, -1):
+forindexinrange(components_len-1, -1, -1):
 ifbuild_file_dir_components[index] =='src':
 options.depth=os.path.sep.join(build_file_dir_components)
 break

gyp/pylib/gyp/easy_xml.py

@@ -81,7 +81,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
 # Optionally in second position is a dictionary of the attributes.
 rest=specification[1:]
 ifrestandisinstance(rest[0], dict):
-forat, valinsorted(rest[0].iteritems()):
+forat, valinsorted(rest[0].items()):
 xml_parts.append(' %s="%s"'% (at, _XmlEscape(val, attr=True)))
 rest=rest[1:]
 ifrest:

gyp/pylib/gyp/generator/android.py

@@ -460,7 +460,7 @@ def WriteSourceFlags(self, spec, configs):
  Args:
  spec, configs: input from gyp.
  """
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 extracted_includes= []
 
 self.WriteLn('\n# Flags passed to both C and C++ files.')
@@ -790,7 +790,7 @@ def WriteTargetFlags(self, spec, configs, link_deps):
 static_libs, dynamic_libs, ldflags_libs=self.FilterLibraries(libraries)
 
 ifself.type!='static_library':
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 ldflags=list(config.get('ldflags', []))
 self.WriteLn('')
 self.WriteList(ldflags, 'LOCAL_LDFLAGS_%s'%configname)
@@ -839,7 +839,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, part_of_all,
 settings=spec.get('aosp_build_settings', {})
 ifsettings:
 self.WriteLn('### Set directly by aosp_build_settings.')
-fork, vinsettings.iteritems():
+fork, vinsettings.items():
 ifisinstance(v, list):
 self.WriteList(v, k)
 else:

gyp/pylib/gyp/generator/gypd.py

@@ -88,7 +88,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 ifnotoutput_fileinoutput_files:
 output_files[output_file] =input_file
 
-foroutput_file, input_fileinoutput_files.iteritems():
+foroutput_file, input_fileinoutput_files.items():
 output=open(output_file, 'w')
 pprint.pprint(data[input_file], output)
 output.close()

gyp/pylib/gyp/generator/make.py

@@ -674,7 +674,7 @@ def _ValidateSourcesForOSX(spec, all_sources):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1547,7 +1547,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 # Postbuilds expect to be run in the gyp file's directory, so insert an
 # implicit postbuild to cd to there.
 postbuilds.insert(0, gyp.common.EncodePOSIXShellList(['cd', self.path]))
-foriinxrange(len(postbuilds)):
+foriinrange(len(postbuilds)):
 ifnotpostbuilds[i].startswith('$'):
 postbuilds[i] =EscapeShellArgument(postbuilds[i])
 self.WriteLn('%s: builddir := $(abs_builddir)'%QuoteSpaces(self.output))

gyp/pylib/gyp/generator/msvs.py

@@ -451,7 +451,7 @@ def _AddCustomBuildToolForMSVS(p, spec, primary_input,
 'CommandLine': cmd,
  })
 # Add to the properties of primary input for each config.
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 p.AddFileConfig(_FixPath(primary_input),
 _ConfigFullName(config_name, c_data), tools=[tool])
 
@@ -971,7 +971,7 @@ def _ValidateSourcesForMSVSProject(spec, version):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1003,7 +1003,7 @@ def _GenerateMSVSProject(project, options, version, generator_flags):
 relative_path_of_gyp_file=gyp.common.RelativePath(gyp_path, project_dir)
 
 config_type=_GetMSVSConfigurationType(spec, project.build_file)
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config)
 
 # MSVC08 and prior version cannot handle duplicate basenames in the same
@@ -1369,10 +1369,10 @@ def _ConvertToolsToExpectedForm(tools):
  A list of Tool objects.
  """
 tool_list= []
-fortool, settingsintools.iteritems():
+fortool, settingsintools.items():
 # Collapse settings with lists.
 settings_fixed= {}
-forsetting, valueinsettings.iteritems():
+forsetting, valueinsettings.items():
 iftype(value) ==list:
 if ((tool=='VCLinkerTool'and
 setting=='AdditionalDependencies') or
@@ -1547,7 +1547,7 @@ def _IdlFilesHandledNonNatively(spec, sources):
 def_GetPrecompileRelatedFiles(spec):
 # Gather a list of precompiled header related sources.
 precompiled_related= []
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forkinprecomp_keys:
 f=config.get(k)
 iff:
@@ -1558,7 +1558,7 @@ def _GetPrecompileRelatedFiles(spec):
 def_ExcludeFilesFromBeingBuilt(p, spec, excluded_sources, excluded_idl,
 list_excluded):
 exclusions=_GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl)
-forfile_name, excluded_configsinexclusions.iteritems():
+forfile_name, excluded_configsinexclusions.items():
 if (notlist_excludedand
 len(excluded_configs) ==len(spec['configurations'])):
 # If we're not listing excluded files, then they won't appear in the
@@ -1575,7 +1575,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude excluded sources from being built.
 forfinexcluded_sources:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 precomped= [_FixPath(config.get(i, '')) foriinprecomp_keys]
 # Don't do this for ones that are precompiled header related.
 iffnotinprecomped:
@@ -1585,7 +1585,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude them now.
 forfinexcluded_idl:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 excluded_configs.append((config_name, config))
 exclusions[f] =excluded_configs
 returnexclusions
@@ -1594,7 +1594,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 def_AddToolFilesToMSVS(p, spec):
 # Add in tool files (rules).
 tool_files=OrderedSet()
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forfinconfig.get('msvs_tool_files', []):
 tool_files.add(f)
 forfintool_files:
@@ -1607,7 +1607,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
 # kind (i.e. C vs. C++) as the precompiled header source stub needs
 # to have use of precompiled headers disabled.
 extensions_excluded_from_precompile= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 source=config.get('msvs_precompiled_source')
 ifsource:
 source=_FixPath(source)
@@ -1628,7 +1628,7 @@ def DisableForSourceTree(source_tree):
 else:
 basename, extension=os.path.splitext(source)
 ifextensioninextensions_excluded_from_precompile:
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 tool=MSVSProject.Tool('VCCLCompilerTool',
  {'UsePrecompiledHeader': '0',
 'ForcedIncludeFiles': '$(NOINHERIT)'})
@@ -1679,7 +1679,7 @@ def _WriteMSVSUserFile(project_path, version, spec):
 return# Nothing to add
 # Write out the user file.
 user_file=_CreateMSVSUserFile(project_path, version, spec)
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 user_file.AddDebugSettings(_ConfigFullName(config_name, c_data),
 action, environment, working_directory)
 user_file.WriteIfChanged()
@@ -1730,7 +1730,7 @@ def _GetPathDict(root, path):
 def_DictsToFolders(base_path, bucket, flat):
 # Convert to folders recursively.
 children= []
-forfolder, contentsinbucket.iteritems():
+forfolder, contentsinbucket.items():
 iftype(contents) ==dict:
 folder_children=_DictsToFolders(os.path.join(base_path, folder),
 contents, flat)
@@ -1802,7 +1802,7 @@ def _GetPlatformOverridesOfProject(spec):
 # Prepare a dict indicating which project configurations are used for which
 # solution configurations for this target.
 config_platform_overrides= {}
-forconfig_name, cinspec['configurations'].iteritems():
+forconfig_name, cinspec['configurations'].items():
 config_fullname=_ConfigFullName(config_name, c)
 platform=c.get('msvs_target_platform', _ConfigPlatform(c))
 fixed_config_fullname='%s|%s'% (
@@ -1941,7 +1941,7 @@ def PerformBuild(data, configurations, params):
 msvs_version=params['msvs_version']
 devenv=os.path.join(msvs_version.path, 'Common7', 'IDE', 'devenv.com')
 
-forbuild_file, build_file_dictindata.iteritems():
+forbuild_file, build_file_dictindata.items():
  (build_file_root, build_file_ext) =os.path.splitext(build_file)
 ifbuild_file_ext!='.gyp':
 continue
@@ -1990,7 +1990,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 configs=set()
 forqualified_targetintarget_list:
 spec=target_dicts[qualified_target]
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 configs.add(_ConfigFullName(config_name, config))
 configs=list(configs)
 
@@ -2630,7 +2630,7 @@ def _GetConfigurationCondition(name, settings):
 
 def_GetMSBuildProjectConfigurations(configurations):
 group= ['ItemGroup', {'Label': 'ProjectConfigurations'}]
-for (name, settings) insorted(configurations.iteritems()):
+for (name, settings) insorted(configurations.items()):
 configuration, platform=_GetConfigurationAndPlatform(name, settings)
 designation='%s|%s'% (configuration, platform)
 group.append(
@@ -2700,7 +2700,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 def_GetMSBuildConfigurationDetails(spec, build_file):
 properties= {}
-forname, settingsinspec['configurations'].iteritems():
+forname, settingsinspec['configurations'].items():
 msbuild_attributes=_GetMSBuildAttributes(spec, settings, build_file)
 condition=_GetConfigurationCondition(name, settings)
 character_set=msbuild_attributes.get('CharacterSet')
@@ -2729,7 +2729,7 @@ def _GetMSBuildPropertySheets(configurations):
 user_props=r'$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'
 additional_props= {}
 props_specified=False
-forname, settingsinsorted(configurations.iteritems()):
+forname, settingsinsorted(configurations.items()):
 configuration=_GetConfigurationCondition(name, settings)
 if'msbuild_props'insettings:
 additional_props[configuration] =_FixPaths(settings['msbuild_props'])
@@ -2751,7 +2751,7 @@ def _GetMSBuildPropertySheets(configurations):
  ]
 else:
 sheets= []
-forcondition, propsinadditional_props.iteritems():
+forcondition, propsinadditional_props.items():
 import_group= [
 'ImportGroup',
  {'Label': 'PropertySheets',
@@ -2878,7 +2878,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 new_paths='$(ExecutablePath);'+';'.join(new_paths)
 
 properties= {}
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 condition=_GetConfigurationCondition(name, configuration)
 attributes=_GetMSBuildAttributes(spec, configuration, build_file)
 msbuild_settings=configuration['finalized_msbuild_settings']
@@ -2903,7 +2903,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 _AddConditionalProperty(properties, condition, 'ExecutablePath',
 new_paths)
 tool_settings=msbuild_settings.get('', {})
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild('', name, value)
 _AddConditionalProperty(properties, condition, name, formatted_value)
 return_GetMSBuildPropertyGroup(spec, None, properties)
@@ -2972,7 +2972,7 @@ def GetEdges(node):
 # NOTE: reverse(topsort(DAG)) = topsort(reverse_edges(DAG))
 fornameinreversed(properties_ordered):
 values=properties[name]
-forvalue, conditionsinsorted(values.iteritems()):
+forvalue, conditionsinsorted(values.items()):
 iflen(conditions) ==num_configurations:
 # If the value is the same all configurations,
 # just add one unconditional entry.
@@ -2985,18 +2985,18 @@ def GetEdges(node):
 
 def_GetMSBuildToolSettingsSections(spec, configurations):
 groups= []
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 msbuild_settings=configuration['finalized_msbuild_settings']
 group= ['ItemDefinitionGroup',
  {'Condition': _GetConfigurationCondition(name, configuration)}
  ]
-fortool_name, tool_settingsinsorted(msbuild_settings.iteritems()):
+fortool_name, tool_settingsinsorted(msbuild_settings.items()):
 # Skip the tool named '' which is a holder of global settings handled
 # by _GetMSBuildConfigurationGlobalProperties.
 iftool_name:
 iftool_settings:
 tool= [tool_name]
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild(tool_name, name,
 value)
 tool.append([name, formatted_value])
@@ -3196,7 +3196,7 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
  {'Condition': condition},
 'true'])
 # Add precompile if needed
-forconfig_name, configurationinspec['configurations'].iteritems():
+forconfig_name, configurationinspec['configurations'].items():
 precompiled_source=configuration.get('msvs_precompiled_source', '')
 ifprecompiled_source!='':
 precompiled_source=_FixPath(precompiled_source)
@@ -3436,7 +3436,7 @@ def _GenerateActionsForMSBuild(spec, actions_to_add):
  """
 sources_handled_by_action=OrderedSet()
 actions_spec= []
-forprimary_input, actionsinactions_to_add.iteritems():
+forprimary_input, actionsinactions_to_add.items():
 inputs=OrderedSet()
 outputs=OrderedSet()
 descriptions= []

gyp/PRESUBMIT.py

@@ -76,8 +76,7 @@
 def_LicenseHeader(input_api):
 # Accept any year number from 2009 to the current year.
 current_year=int(input_api.time.strftime('%Y'))
-allowed_years= (str(s) forsinreversed(xrange(2009, current_year+1)))
-
+allowed_years= (str(s) forsinreversed(range(2009, current_year+1)))
 years_re='('+'|'.join(allowed_years) +')'
 
 # The (c) is deprecated, but tolerate it until it's removed from all files.

gyp/pylib/gyp/MSVSSettings.py

@@ -435,7 +435,7 @@ def ConvertVCMacrosToMSBuild(s):
 '$(PlatformName)': '$(Platform)',
 '$(SafeInputName)': '%(Filename)',
  }
-forold, newinreplace_map.iteritems():
+forold, newinreplace_map.items():
 s=s.replace(old, new)
 s=FixVCMacroSlashes(s)
 returns
@@ -455,10 +455,10 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  dictionaries of settings and their values.
  """
 msbuild_settings= {}
-formsvs_tool_name, msvs_tool_settingsinmsvs_settings.iteritems():
+formsvs_tool_name, msvs_tool_settingsinmsvs_settings.items():
 ifmsvs_tool_namein_msvs_to_msbuild_converters:
 msvs_tool=_msvs_to_msbuild_converters[msvs_tool_name]
-formsvs_setting, msvs_valueinmsvs_tool_settings.iteritems():
+formsvs_setting, msvs_valueinmsvs_tool_settings.items():
 ifmsvs_settinginmsvs_tool:
 # Invoke the translation function.
 try:
@@ -515,7 +515,7 @@ def _ValidateSettings(validators, settings, stderr):
 fortool_nameinsettings:
 iftool_nameinvalidators:
 tool_validators=validators[tool_name]
-forsetting, valueinsettings[tool_name].iteritems():
+forsetting, valueinsettings[tool_name].items():
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)

gyp/pylib/gyp/MSVSUserFile.py

@@ -91,7 +91,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 
 ifenvironmentandisinstance(environment, dict):
 env_list= ['%s="%s"'% (key, val)
-for (key,val) inenvironment.iteritems()]
+for (key,val) inenvironment.items()]
 environment=' '.join(env_list)
 else:
 environment=''
@@ -135,7 +135,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 defWriteIfChanged(self):
 """Writes the user file."""
 configs= ['Configurations']
-forconfig, specinsorted(self.configurations.iteritems()):
+forconfig, specinsorted(self.configurations.items()):
 configs.append(spec)
 
 content= ['VisualStudioUserFile',

gyp/pylib/gyp/MSVSUtil.py

@@ -235,7 +235,7 @@ def InsertLargePdbShims(target_list, target_dicts, vars):
 
 # Set up the shim to output its PDB to the same location as the final linker
 # target.
-forconfig_name, configinshim_dict.get('configurations').iteritems():
+forconfig_name, configinshim_dict.get('configurations').items():
 pdb_path=_GetPdbPath(target_dict, config_name, vars)
 
 # A few keys that we don't want to propagate.

gyp/pylib/gyp/__init__.py

@@ -209,7 +209,7 @@ def Noop(value):
 # We always want to ignore the environment when regenerating, to avoid
 # duplicate or changed flags in the environment at the time of regeneration.
 flags= ['--ignore-environment']
-forname, metadatainoptions._regeneration_metadata.iteritems():
+forname, metadatainoptions._regeneration_metadata.items():
 opt=metadata['opt']
 value=getattr(options, name)
 value_predicate=metadata['type'] =='path'andFixPathorNoop
@@ -434,7 +434,7 @@ def gyp_main(args):
 build_file_dir=os.path.abspath(os.path.dirname(build_file))
 build_file_dir_components=build_file_dir.split(os.path.sep)
 components_len=len(build_file_dir_components)
-forindexinxrange(components_len-1, -1, -1):
+forindexinrange(components_len-1, -1, -1):
 ifbuild_file_dir_components[index] =='src':
 options.depth=os.path.sep.join(build_file_dir_components)
 break

gyp/pylib/gyp/easy_xml.py

@@ -81,7 +81,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
 # Optionally in second position is a dictionary of the attributes.
 rest=specification[1:]
 ifrestandisinstance(rest[0], dict):
-forat, valinsorted(rest[0].iteritems()):
+forat, valinsorted(rest[0].items()):
 xml_parts.append(' %s="%s"'% (at, _XmlEscape(val, attr=True)))
 rest=rest[1:]
 ifrest:

gyp/pylib/gyp/generator/android.py

@@ -460,7 +460,7 @@ def WriteSourceFlags(self, spec, configs):
  Args:
  spec, configs: input from gyp.
  """
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 extracted_includes= []
 
 self.WriteLn('\n# Flags passed to both C and C++ files.')
@@ -790,7 +790,7 @@ def WriteTargetFlags(self, spec, configs, link_deps):
 static_libs, dynamic_libs, ldflags_libs=self.FilterLibraries(libraries)
 
 ifself.type!='static_library':
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 ldflags=list(config.get('ldflags', []))
 self.WriteLn('')
 self.WriteList(ldflags, 'LOCAL_LDFLAGS_%s'%configname)
@@ -839,7 +839,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, part_of_all,
 settings=spec.get('aosp_build_settings', {})
 ifsettings:
 self.WriteLn('### Set directly by aosp_build_settings.')
-fork, vinsettings.iteritems():
+fork, vinsettings.items():
 ifisinstance(v, list):
 self.WriteList(v, k)
 else:

gyp/pylib/gyp/generator/gypd.py

@@ -88,7 +88,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 ifnotoutput_fileinoutput_files:
 output_files[output_file] =input_file
 
-foroutput_file, input_fileinoutput_files.iteritems():
+foroutput_file, input_fileinoutput_files.items():
 output=open(output_file, 'w')
 pprint.pprint(data[input_file], output)
 output.close()

gyp/pylib/gyp/generator/make.py

@@ -674,7 +674,7 @@ def _ValidateSourcesForOSX(spec, all_sources):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1547,7 +1547,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 # Postbuilds expect to be run in the gyp file's directory, so insert an
 # implicit postbuild to cd to there.
 postbuilds.insert(0, gyp.common.EncodePOSIXShellList(['cd', self.path]))
-foriinxrange(len(postbuilds)):
+foriinrange(len(postbuilds)):
 ifnotpostbuilds[i].startswith('$'):
 postbuilds[i] =EscapeShellArgument(postbuilds[i])
 self.WriteLn('%s: builddir := $(abs_builddir)'%QuoteSpaces(self.output))

gyp/pylib/gyp/generator/msvs.py

@@ -451,7 +451,7 @@ def _AddCustomBuildToolForMSVS(p, spec, primary_input,
 'CommandLine': cmd,
  })
 # Add to the properties of primary input for each config.
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 p.AddFileConfig(_FixPath(primary_input),
 _ConfigFullName(config_name, c_data), tools=[tool])
 
@@ -971,7 +971,7 @@ def _ValidateSourcesForMSVSProject(spec, version):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1003,7 +1003,7 @@ def _GenerateMSVSProject(project, options, version, generator_flags):
 relative_path_of_gyp_file=gyp.common.RelativePath(gyp_path, project_dir)
 
 config_type=_GetMSVSConfigurationType(spec, project.build_file)
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config)
 
 # MSVC08 and prior version cannot handle duplicate basenames in the same
@@ -1369,10 +1369,10 @@ def _ConvertToolsToExpectedForm(tools):
  A list of Tool objects.
  """
 tool_list= []
-fortool, settingsintools.iteritems():
+fortool, settingsintools.items():
 # Collapse settings with lists.
 settings_fixed= {}
-forsetting, valueinsettings.iteritems():
+forsetting, valueinsettings.items():
 iftype(value) ==list:
 if ((tool=='VCLinkerTool'and
 setting=='AdditionalDependencies') or
@@ -1547,7 +1547,7 @@ def _IdlFilesHandledNonNatively(spec, sources):
 def_GetPrecompileRelatedFiles(spec):
 # Gather a list of precompiled header related sources.
 precompiled_related= []
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forkinprecomp_keys:
 f=config.get(k)
 iff:
@@ -1558,7 +1558,7 @@ def _GetPrecompileRelatedFiles(spec):
 def_ExcludeFilesFromBeingBuilt(p, spec, excluded_sources, excluded_idl,
 list_excluded):
 exclusions=_GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl)
-forfile_name, excluded_configsinexclusions.iteritems():
+forfile_name, excluded_configsinexclusions.items():
 if (notlist_excludedand
 len(excluded_configs) ==len(spec['configurations'])):
 # If we're not listing excluded files, then they won't appear in the
@@ -1575,7 +1575,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude excluded sources from being built.
 forfinexcluded_sources:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 precomped= [_FixPath(config.get(i, '')) foriinprecomp_keys]
 # Don't do this for ones that are precompiled header related.
 iffnotinprecomped:
@@ -1585,7 +1585,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude them now.
 forfinexcluded_idl:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 excluded_configs.append((config_name, config))
 exclusions[f] =excluded_configs
 returnexclusions
@@ -1594,7 +1594,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 def_AddToolFilesToMSVS(p, spec):
 # Add in tool files (rules).
 tool_files=OrderedSet()
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forfinconfig.get('msvs_tool_files', []):
 tool_files.add(f)
 forfintool_files:
@@ -1607,7 +1607,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
 # kind (i.e. C vs. C++) as the precompiled header source stub needs
 # to have use of precompiled headers disabled.
 extensions_excluded_from_precompile= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 source=config.get('msvs_precompiled_source')
 ifsource:
 source=_FixPath(source)
@@ -1628,7 +1628,7 @@ def DisableForSourceTree(source_tree):
 else:
 basename, extension=os.path.splitext(source)
 ifextensioninextensions_excluded_from_precompile:
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 tool=MSVSProject.Tool('VCCLCompilerTool',
  {'UsePrecompiledHeader': '0',
 'ForcedIncludeFiles': '$(NOINHERIT)'})
@@ -1679,7 +1679,7 @@ def _WriteMSVSUserFile(project_path, version, spec):
 return# Nothing to add
 # Write out the user file.
 user_file=_CreateMSVSUserFile(project_path, version, spec)
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 user_file.AddDebugSettings(_ConfigFullName(config_name, c_data),
 action, environment, working_directory)
 user_file.WriteIfChanged()
@@ -1730,7 +1730,7 @@ def _GetPathDict(root, path):
 def_DictsToFolders(base_path, bucket, flat):
 # Convert to folders recursively.
 children= []
-forfolder, contentsinbucket.iteritems():
+forfolder, contentsinbucket.items():
 iftype(contents) ==dict:
 folder_children=_DictsToFolders(os.path.join(base_path, folder),
 contents, flat)
@@ -1802,7 +1802,7 @@ def _GetPlatformOverridesOfProject(spec):
 # Prepare a dict indicating which project configurations are used for which
 # solution configurations for this target.
 config_platform_overrides= {}
-forconfig_name, cinspec['configurations'].iteritems():
+forconfig_name, cinspec['configurations'].items():
 config_fullname=_ConfigFullName(config_name, c)
 platform=c.get('msvs_target_platform', _ConfigPlatform(c))
 fixed_config_fullname='%s|%s'% (
@@ -1941,7 +1941,7 @@ def PerformBuild(data, configurations, params):
 msvs_version=params['msvs_version']
 devenv=os.path.join(msvs_version.path, 'Common7', 'IDE', 'devenv.com')
 
-forbuild_file, build_file_dictindata.iteritems():
+forbuild_file, build_file_dictindata.items():
  (build_file_root, build_file_ext) =os.path.splitext(build_file)
 ifbuild_file_ext!='.gyp':
 continue
@@ -1990,7 +1990,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 configs=set()
 forqualified_targetintarget_list:
 spec=target_dicts[qualified_target]
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 configs.add(_ConfigFullName(config_name, config))
 configs=list(configs)
 
@@ -2630,7 +2630,7 @@ def _GetConfigurationCondition(name, settings):
 
 def_GetMSBuildProjectConfigurations(configurations):
 group= ['ItemGroup', {'Label': 'ProjectConfigurations'}]
-for (name, settings) insorted(configurations.iteritems()):
+for (name, settings) insorted(configurations.items()):
 configuration, platform=_GetConfigurationAndPlatform(name, settings)
 designation='%s|%s'% (configuration, platform)
 group.append(
@@ -2700,7 +2700,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 def_GetMSBuildConfigurationDetails(spec, build_file):
 properties= {}
-forname, settingsinspec['configurations'].iteritems():
+forname, settingsinspec['configurations'].items():
 msbuild_attributes=_GetMSBuildAttributes(spec, settings, build_file)
 condition=_GetConfigurationCondition(name, settings)
 character_set=msbuild_attributes.get('CharacterSet')
@@ -2729,7 +2729,7 @@ def _GetMSBuildPropertySheets(configurations):
 user_props=r'$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'
 additional_props= {}
 props_specified=False
-forname, settingsinsorted(configurations.iteritems()):
+forname, settingsinsorted(configurations.items()):
 configuration=_GetConfigurationCondition(name, settings)
 if'msbuild_props'insettings:
 additional_props[configuration] =_FixPaths(settings['msbuild_props'])
@@ -2751,7 +2751,7 @@ def _GetMSBuildPropertySheets(configurations):
  ]
 else:
 sheets= []
-forcondition, propsinadditional_props.iteritems():
+forcondition, propsinadditional_props.items():
 import_group= [
 'ImportGroup',
  {'Label': 'PropertySheets',
@@ -2878,7 +2878,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 new_paths='$(ExecutablePath);'+';'.join(new_paths)
 
 properties= {}
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 condition=_GetConfigurationCondition(name, configuration)
 attributes=_GetMSBuildAttributes(spec, configuration, build_file)
 msbuild_settings=configuration['finalized_msbuild_settings']
@@ -2903,7 +2903,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 _AddConditionalProperty(properties, condition, 'ExecutablePath',
 new_paths)
 tool_settings=msbuild_settings.get('', {})
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild('', name, value)
 _AddConditionalProperty(properties, condition, name, formatted_value)
 return_GetMSBuildPropertyGroup(spec, None, properties)
@@ -2972,7 +2972,7 @@ def GetEdges(node):
 # NOTE: reverse(topsort(DAG)) = topsort(reverse_edges(DAG))
 fornameinreversed(properties_ordered):
 values=properties[name]
-forvalue, conditionsinsorted(values.iteritems()):
+forvalue, conditionsinsorted(values.items()):
 iflen(conditions) ==num_configurations:
 # If the value is the same all configurations,
 # just add one unconditional entry.
@@ -2985,18 +2985,18 @@ def GetEdges(node):
 
 def_GetMSBuildToolSettingsSections(spec, configurations):
 groups= []
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 msbuild_settings=configuration['finalized_msbuild_settings']
 group= ['ItemDefinitionGroup',
  {'Condition': _GetConfigurationCondition(name, configuration)}
  ]
-fortool_name, tool_settingsinsorted(msbuild_settings.iteritems()):
+fortool_name, tool_settingsinsorted(msbuild_settings.items()):
 # Skip the tool named '' which is a holder of global settings handled
 # by _GetMSBuildConfigurationGlobalProperties.
 iftool_name:
 iftool_settings:
 tool= [tool_name]
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild(tool_name, name,
 value)
 tool.append([name, formatted_value])
@@ -3196,7 +3196,7 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
  {'Condition': condition},
 'true'])
 # Add precompile if needed
-forconfig_name, configurationinspec['configurations'].iteritems():
+forconfig_name, configurationinspec['configurations'].items():
 precompiled_source=configuration.get('msvs_precompiled_source', '')
 ifprecompiled_source!='':
 precompiled_source=_FixPath(precompiled_source)
@@ -3436,7 +3436,7 @@ def _GenerateActionsForMSBuild(spec, actions_to_add):
  """
 sources_handled_by_action=OrderedSet()
 actions_spec= []
-forprimary_input, actionsinactions_to_add.iteritems():
+forprimary_input, actionsinactions_to_add.items():
 inputs=OrderedSet()
 outputs=OrderedSet()
 descriptions= []

gyp/PRESUBMIT.py

@@ -76,8 +76,7 @@
 def_LicenseHeader(input_api):
 # Accept any year number from 2009 to the current year.
 current_year=int(input_api.time.strftime('%Y'))
-allowed_years= (str(s) forsinreversed(xrange(2009, current_year+1)))
-
+allowed_years= (str(s) forsinreversed(range(2009, current_year+1)))
 years_re='('+'|'.join(allowed_years) +')'
 
 # The (c) is deprecated, but tolerate it until it's removed from all files.

gyp/pylib/gyp/MSVSSettings.py

@@ -435,7 +435,7 @@ def ConvertVCMacrosToMSBuild(s):
 '$(PlatformName)': '$(Platform)',
 '$(SafeInputName)': '%(Filename)',
  }
-forold, newinreplace_map.iteritems():
+forold, newinreplace_map.items():
 s=s.replace(old, new)
 s=FixVCMacroSlashes(s)
 returns
@@ -455,10 +455,10 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  dictionaries of settings and their values.
  """
 msbuild_settings= {}
-formsvs_tool_name, msvs_tool_settingsinmsvs_settings.iteritems():
+formsvs_tool_name, msvs_tool_settingsinmsvs_settings.items():
 ifmsvs_tool_namein_msvs_to_msbuild_converters:
 msvs_tool=_msvs_to_msbuild_converters[msvs_tool_name]
-formsvs_setting, msvs_valueinmsvs_tool_settings.iteritems():
+formsvs_setting, msvs_valueinmsvs_tool_settings.items():
 ifmsvs_settinginmsvs_tool:
 # Invoke the translation function.
 try:
@@ -515,7 +515,7 @@ def _ValidateSettings(validators, settings, stderr):
 fortool_nameinsettings:
 iftool_nameinvalidators:
 tool_validators=validators[tool_name]
-forsetting, valueinsettings[tool_name].iteritems():
+forsetting, valueinsettings[tool_name].items():
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)

gyp/pylib/gyp/MSVSUserFile.py

@@ -91,7 +91,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 
 ifenvironmentandisinstance(environment, dict):
 env_list= ['%s="%s"'% (key, val)
-for (key,val) inenvironment.iteritems()]
+for (key,val) inenvironment.items()]
 environment=' '.join(env_list)
 else:
 environment=''
@@ -135,7 +135,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 defWriteIfChanged(self):
 """Writes the user file."""
 configs= ['Configurations']
-forconfig, specinsorted(self.configurations.iteritems()):
+forconfig, specinsorted(self.configurations.items()):
 configs.append(spec)
 
 content= ['VisualStudioUserFile',

gyp/pylib/gyp/MSVSUtil.py

@@ -235,7 +235,7 @@ def InsertLargePdbShims(target_list, target_dicts, vars):
 
 # Set up the shim to output its PDB to the same location as the final linker
 # target.
-forconfig_name, configinshim_dict.get('configurations').iteritems():
+forconfig_name, configinshim_dict.get('configurations').items():
 pdb_path=_GetPdbPath(target_dict, config_name, vars)
 
 # A few keys that we don't want to propagate.

gyp/pylib/gyp/__init__.py

@@ -209,7 +209,7 @@ def Noop(value):
 # We always want to ignore the environment when regenerating, to avoid
 # duplicate or changed flags in the environment at the time of regeneration.
 flags= ['--ignore-environment']
-forname, metadatainoptions._regeneration_metadata.iteritems():
+forname, metadatainoptions._regeneration_metadata.items():
 opt=metadata['opt']
 value=getattr(options, name)
 value_predicate=metadata['type'] =='path'andFixPathorNoop
@@ -434,7 +434,7 @@ def gyp_main(args):
 build_file_dir=os.path.abspath(os.path.dirname(build_file))
 build_file_dir_components=build_file_dir.split(os.path.sep)
 components_len=len(build_file_dir_components)
-forindexinxrange(components_len-1, -1, -1):
+forindexinrange(components_len-1, -1, -1):
 ifbuild_file_dir_components[index] =='src':
 options.depth=os.path.sep.join(build_file_dir_components)
 break

gyp/pylib/gyp/easy_xml.py

@@ -81,7 +81,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
 # Optionally in second position is a dictionary of the attributes.
 rest=specification[1:]
 ifrestandisinstance(rest[0], dict):
-forat, valinsorted(rest[0].iteritems()):
+forat, valinsorted(rest[0].items()):
 xml_parts.append(' %s="%s"'% (at, _XmlEscape(val, attr=True)))
 rest=rest[1:]
 ifrest:

gyp/pylib/gyp/generator/android.py

@@ -460,7 +460,7 @@ def WriteSourceFlags(self, spec, configs):
  Args:
  spec, configs: input from gyp.
  """
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 extracted_includes= []
 
 self.WriteLn('\n# Flags passed to both C and C++ files.')
@@ -790,7 +790,7 @@ def WriteTargetFlags(self, spec, configs, link_deps):
 static_libs, dynamic_libs, ldflags_libs=self.FilterLibraries(libraries)
 
 ifself.type!='static_library':
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 ldflags=list(config.get('ldflags', []))
 self.WriteLn('')
 self.WriteList(ldflags, 'LOCAL_LDFLAGS_%s'%configname)
@@ -839,7 +839,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, part_of_all,
 settings=spec.get('aosp_build_settings', {})
 ifsettings:
 self.WriteLn('### Set directly by aosp_build_settings.')
-fork, vinsettings.iteritems():
+fork, vinsettings.items():
 ifisinstance(v, list):
 self.WriteList(v, k)
 else:

gyp/pylib/gyp/generator/gypd.py

@@ -88,7 +88,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 ifnotoutput_fileinoutput_files:
 output_files[output_file] =input_file
 
-foroutput_file, input_fileinoutput_files.iteritems():
+foroutput_file, input_fileinoutput_files.items():
 output=open(output_file, 'w')
 pprint.pprint(data[input_file], output)
 output.close()

gyp/pylib/gyp/generator/make.py

@@ -674,7 +674,7 @@ def _ValidateSourcesForOSX(spec, all_sources):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1547,7 +1547,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 # Postbuilds expect to be run in the gyp file's directory, so insert an
 # implicit postbuild to cd to there.
 postbuilds.insert(0, gyp.common.EncodePOSIXShellList(['cd', self.path]))
-foriinxrange(len(postbuilds)):
+foriinrange(len(postbuilds)):
 ifnotpostbuilds[i].startswith('$'):
 postbuilds[i] =EscapeShellArgument(postbuilds[i])
 self.WriteLn('%s: builddir := $(abs_builddir)'%QuoteSpaces(self.output))

gyp/pylib/gyp/generator/msvs.py

@@ -451,7 +451,7 @@ def _AddCustomBuildToolForMSVS(p, spec, primary_input,
 'CommandLine': cmd,
  })
 # Add to the properties of primary input for each config.
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 p.AddFileConfig(_FixPath(primary_input),
 _ConfigFullName(config_name, c_data), tools=[tool])
 
@@ -971,7 +971,7 @@ def _ValidateSourcesForMSVSProject(spec, version):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1003,7 +1003,7 @@ def _GenerateMSVSProject(project, options, version, generator_flags):
 relative_path_of_gyp_file=gyp.common.RelativePath(gyp_path, project_dir)
 
 config_type=_GetMSVSConfigurationType(spec, project.build_file)
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config)
 
 # MSVC08 and prior version cannot handle duplicate basenames in the same
@@ -1369,10 +1369,10 @@ def _ConvertToolsToExpectedForm(tools):
  A list of Tool objects.
  """
 tool_list= []
-fortool, settingsintools.iteritems():
+fortool, settingsintools.items():
 # Collapse settings with lists.
 settings_fixed= {}
-forsetting, valueinsettings.iteritems():
+forsetting, valueinsettings.items():
 iftype(value) ==list:
 if ((tool=='VCLinkerTool'and
 setting=='AdditionalDependencies') or
@@ -1547,7 +1547,7 @@ def _IdlFilesHandledNonNatively(spec, sources):
 def_GetPrecompileRelatedFiles(spec):
 # Gather a list of precompiled header related sources.
 precompiled_related= []
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forkinprecomp_keys:
 f=config.get(k)
 iff:
@@ -1558,7 +1558,7 @@ def _GetPrecompileRelatedFiles(spec):
 def_ExcludeFilesFromBeingBuilt(p, spec, excluded_sources, excluded_idl,
 list_excluded):
 exclusions=_GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl)
-forfile_name, excluded_configsinexclusions.iteritems():
+forfile_name, excluded_configsinexclusions.items():
 if (notlist_excludedand
 len(excluded_configs) ==len(spec['configurations'])):
 # If we're not listing excluded files, then they won't appear in the
@@ -1575,7 +1575,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude excluded sources from being built.
 forfinexcluded_sources:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 precomped= [_FixPath(config.get(i, '')) foriinprecomp_keys]
 # Don't do this for ones that are precompiled header related.
 iffnotinprecomped:
@@ -1585,7 +1585,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude them now.
 forfinexcluded_idl:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 excluded_configs.append((config_name, config))
 exclusions[f] =excluded_configs
 returnexclusions
@@ -1594,7 +1594,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 def_AddToolFilesToMSVS(p, spec):
 # Add in tool files (rules).
 tool_files=OrderedSet()
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forfinconfig.get('msvs_tool_files', []):
 tool_files.add(f)
 forfintool_files:
@@ -1607,7 +1607,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
 # kind (i.e. C vs. C++) as the precompiled header source stub needs
 # to have use of precompiled headers disabled.
 extensions_excluded_from_precompile= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 source=config.get('msvs_precompiled_source')
 ifsource:
 source=_FixPath(source)
@@ -1628,7 +1628,7 @@ def DisableForSourceTree(source_tree):
 else:
 basename, extension=os.path.splitext(source)
 ifextensioninextensions_excluded_from_precompile:
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 tool=MSVSProject.Tool('VCCLCompilerTool',
  {'UsePrecompiledHeader': '0',
 'ForcedIncludeFiles': '$(NOINHERIT)'})
@@ -1679,7 +1679,7 @@ def _WriteMSVSUserFile(project_path, version, spec):
 return# Nothing to add
 # Write out the user file.
 user_file=_CreateMSVSUserFile(project_path, version, spec)
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 user_file.AddDebugSettings(_ConfigFullName(config_name, c_data),
 action, environment, working_directory)
 user_file.WriteIfChanged()
@@ -1730,7 +1730,7 @@ def _GetPathDict(root, path):
 def_DictsToFolders(base_path, bucket, flat):
 # Convert to folders recursively.
 children= []
-forfolder, contentsinbucket.iteritems():
+forfolder, contentsinbucket.items():
 iftype(contents) ==dict:
 folder_children=_DictsToFolders(os.path.join(base_path, folder),
 contents, flat)
@@ -1802,7 +1802,7 @@ def _GetPlatformOverridesOfProject(spec):
 # Prepare a dict indicating which project configurations are used for which
 # solution configurations for this target.
 config_platform_overrides= {}
-forconfig_name, cinspec['configurations'].iteritems():
+forconfig_name, cinspec['configurations'].items():
 config_fullname=_ConfigFullName(config_name, c)
 platform=c.get('msvs_target_platform', _ConfigPlatform(c))
 fixed_config_fullname='%s|%s'% (
@@ -1941,7 +1941,7 @@ def PerformBuild(data, configurations, params):
 msvs_version=params['msvs_version']
 devenv=os.path.join(msvs_version.path, 'Common7', 'IDE', 'devenv.com')
 
-forbuild_file, build_file_dictindata.iteritems():
+forbuild_file, build_file_dictindata.items():
  (build_file_root, build_file_ext) =os.path.splitext(build_file)
 ifbuild_file_ext!='.gyp':
 continue
@@ -1990,7 +1990,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 configs=set()
 forqualified_targetintarget_list:
 spec=target_dicts[qualified_target]
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 configs.add(_ConfigFullName(config_name, config))
 configs=list(configs)
 
@@ -2630,7 +2630,7 @@ def _GetConfigurationCondition(name, settings):
 
 def_GetMSBuildProjectConfigurations(configurations):
 group= ['ItemGroup', {'Label': 'ProjectConfigurations'}]
-for (name, settings) insorted(configurations.iteritems()):
+for (name, settings) insorted(configurations.items()):
 configuration, platform=_GetConfigurationAndPlatform(name, settings)
 designation='%s|%s'% (configuration, platform)
 group.append(
@@ -2700,7 +2700,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 def_GetMSBuildConfigurationDetails(spec, build_file):
 properties= {}
-forname, settingsinspec['configurations'].iteritems():
+forname, settingsinspec['configurations'].items():
 msbuild_attributes=_GetMSBuildAttributes(spec, settings, build_file)
 condition=_GetConfigurationCondition(name, settings)
 character_set=msbuild_attributes.get('CharacterSet')
@@ -2729,7 +2729,7 @@ def _GetMSBuildPropertySheets(configurations):
 user_props=r'$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'
 additional_props= {}
 props_specified=False
-forname, settingsinsorted(configurations.iteritems()):
+forname, settingsinsorted(configurations.items()):
 configuration=_GetConfigurationCondition(name, settings)
 if'msbuild_props'insettings:
 additional_props[configuration] =_FixPaths(settings['msbuild_props'])
@@ -2751,7 +2751,7 @@ def _GetMSBuildPropertySheets(configurations):
  ]
 else:
 sheets= []
-forcondition, propsinadditional_props.iteritems():
+forcondition, propsinadditional_props.items():
 import_group= [
 'ImportGroup',
  {'Label': 'PropertySheets',
@@ -2878,7 +2878,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 new_paths='$(ExecutablePath);'+';'.join(new_paths)
 
 properties= {}
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 condition=_GetConfigurationCondition(name, configuration)
 attributes=_GetMSBuildAttributes(spec, configuration, build_file)
 msbuild_settings=configuration['finalized_msbuild_settings']
@@ -2903,7 +2903,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 _AddConditionalProperty(properties, condition, 'ExecutablePath',
 new_paths)
 tool_settings=msbuild_settings.get('', {})
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild('', name, value)
 _AddConditionalProperty(properties, condition, name, formatted_value)
 return_GetMSBuildPropertyGroup(spec, None, properties)
@@ -2972,7 +2972,7 @@ def GetEdges(node):
 # NOTE: reverse(topsort(DAG)) = topsort(reverse_edges(DAG))
 fornameinreversed(properties_ordered):
 values=properties[name]
-forvalue, conditionsinsorted(values.iteritems()):
+forvalue, conditionsinsorted(values.items()):
 iflen(conditions) ==num_configurations:
 # If the value is the same all configurations,
 # just add one unconditional entry.
@@ -2985,18 +2985,18 @@ def GetEdges(node):
 
 def_GetMSBuildToolSettingsSections(spec, configurations):
 groups= []
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 msbuild_settings=configuration['finalized_msbuild_settings']
 group= ['ItemDefinitionGroup',
  {'Condition': _GetConfigurationCondition(name, configuration)}
  ]
-fortool_name, tool_settingsinsorted(msbuild_settings.iteritems()):
+fortool_name, tool_settingsinsorted(msbuild_settings.items()):
 # Skip the tool named '' which is a holder of global settings handled
 # by _GetMSBuildConfigurationGlobalProperties.
 iftool_name:
 iftool_settings:
 tool= [tool_name]
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild(tool_name, name,
 value)
 tool.append([name, formatted_value])
@@ -3196,7 +3196,7 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
  {'Condition': condition},
 'true'])
 # Add precompile if needed
-forconfig_name, configurationinspec['configurations'].iteritems():
+forconfig_name, configurationinspec['configurations'].items():
 precompiled_source=configuration.get('msvs_precompiled_source', '')
 ifprecompiled_source!='':
 precompiled_source=_FixPath(precompiled_source)
@@ -3436,7 +3436,7 @@ def _GenerateActionsForMSBuild(spec, actions_to_add):
  """
 sources_handled_by_action=OrderedSet()
 actions_spec= []
-forprimary_input, actionsinactions_to_add.iteritems():
+forprimary_input, actionsinactions_to_add.items():
 inputs=OrderedSet()
 outputs=OrderedSet()
 descriptions= []

gyp/PRESUBMIT.py

@@ -76,8 +76,7 @@
 def_LicenseHeader(input_api):
 # Accept any year number from 2009 to the current year.
 current_year=int(input_api.time.strftime('%Y'))
-allowed_years= (str(s) forsinreversed(xrange(2009, current_year+1)))
-
+allowed_years= (str(s) forsinreversed(range(2009, current_year+1)))
 years_re='('+'|'.join(allowed_years) +')'
 
 # The (c) is deprecated, but tolerate it until it's removed from all files.

gyp/pylib/gyp/MSVSSettings.py

@@ -435,7 +435,7 @@ def ConvertVCMacrosToMSBuild(s):
 '$(PlatformName)': '$(Platform)',
 '$(SafeInputName)': '%(Filename)',
  }
-forold, newinreplace_map.iteritems():
+forold, newinreplace_map.items():
 s=s.replace(old, new)
 s=FixVCMacroSlashes(s)
 returns
@@ -455,10 +455,10 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  dictionaries of settings and their values.
  """
 msbuild_settings= {}
-formsvs_tool_name, msvs_tool_settingsinmsvs_settings.iteritems():
+formsvs_tool_name, msvs_tool_settingsinmsvs_settings.items():
 ifmsvs_tool_namein_msvs_to_msbuild_converters:
 msvs_tool=_msvs_to_msbuild_converters[msvs_tool_name]
-formsvs_setting, msvs_valueinmsvs_tool_settings.iteritems():
+formsvs_setting, msvs_valueinmsvs_tool_settings.items():
 ifmsvs_settinginmsvs_tool:
 # Invoke the translation function.
 try:
@@ -515,7 +515,7 @@ def _ValidateSettings(validators, settings, stderr):
 fortool_nameinsettings:
 iftool_nameinvalidators:
 tool_validators=validators[tool_name]
-forsetting, valueinsettings[tool_name].iteritems():
+forsetting, valueinsettings[tool_name].items():
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)

gyp/pylib/gyp/MSVSUserFile.py

@@ -91,7 +91,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 
 ifenvironmentandisinstance(environment, dict):
 env_list= ['%s="%s"'% (key, val)
-for (key,val) inenvironment.iteritems()]
+for (key,val) inenvironment.items()]
 environment=' '.join(env_list)
 else:
 environment=''
@@ -135,7 +135,7 @@ def AddDebugSettings(self, config_name, command, environment = {},
 defWriteIfChanged(self):
 """Writes the user file."""
 configs= ['Configurations']
-forconfig, specinsorted(self.configurations.iteritems()):
+forconfig, specinsorted(self.configurations.items()):
 configs.append(spec)
 
 content= ['VisualStudioUserFile',

gyp/pylib/gyp/MSVSUtil.py

@@ -235,7 +235,7 @@ def InsertLargePdbShims(target_list, target_dicts, vars):
 
 # Set up the shim to output its PDB to the same location as the final linker
 # target.
-forconfig_name, configinshim_dict.get('configurations').iteritems():
+forconfig_name, configinshim_dict.get('configurations').items():
 pdb_path=_GetPdbPath(target_dict, config_name, vars)
 
 # A few keys that we don't want to propagate.

gyp/pylib/gyp/__init__.py

@@ -209,7 +209,7 @@ def Noop(value):
 # We always want to ignore the environment when regenerating, to avoid
 # duplicate or changed flags in the environment at the time of regeneration.
 flags= ['--ignore-environment']
-forname, metadatainoptions._regeneration_metadata.iteritems():
+forname, metadatainoptions._regeneration_metadata.items():
 opt=metadata['opt']
 value=getattr(options, name)
 value_predicate=metadata['type'] =='path'andFixPathorNoop
@@ -434,7 +434,7 @@ def gyp_main(args):
 build_file_dir=os.path.abspath(os.path.dirname(build_file))
 build_file_dir_components=build_file_dir.split(os.path.sep)
 components_len=len(build_file_dir_components)
-forindexinxrange(components_len-1, -1, -1):
+forindexinrange(components_len-1, -1, -1):
 ifbuild_file_dir_components[index] =='src':
 options.depth=os.path.sep.join(build_file_dir_components)
 break

gyp/pylib/gyp/easy_xml.py

@@ -81,7 +81,7 @@ def _ConstructContentList(xml_parts, specification, pretty, level=0):
 # Optionally in second position is a dictionary of the attributes.
 rest=specification[1:]
 ifrestandisinstance(rest[0], dict):
-forat, valinsorted(rest[0].iteritems()):
+forat, valinsorted(rest[0].items()):
 xml_parts.append(' %s="%s"'% (at, _XmlEscape(val, attr=True)))
 rest=rest[1:]
 ifrest:

gyp/pylib/gyp/generator/android.py

@@ -460,7 +460,7 @@ def WriteSourceFlags(self, spec, configs):
  Args:
  spec, configs: input from gyp.
  """
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 extracted_includes= []
 
 self.WriteLn('\n# Flags passed to both C and C++ files.')
@@ -790,7 +790,7 @@ def WriteTargetFlags(self, spec, configs, link_deps):
 static_libs, dynamic_libs, ldflags_libs=self.FilterLibraries(libraries)
 
 ifself.type!='static_library':
-forconfigname, configinsorted(configs.iteritems()):
+forconfigname, configinsorted(configs.items()):
 ldflags=list(config.get('ldflags', []))
 self.WriteLn('')
 self.WriteList(ldflags, 'LOCAL_LDFLAGS_%s'%configname)
@@ -839,7 +839,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, part_of_all,
 settings=spec.get('aosp_build_settings', {})
 ifsettings:
 self.WriteLn('### Set directly by aosp_build_settings.')
-fork, vinsettings.iteritems():
+fork, vinsettings.items():
 ifisinstance(v, list):
 self.WriteList(v, k)
 else:

gyp/pylib/gyp/generator/gypd.py

@@ -88,7 +88,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 ifnotoutput_fileinoutput_files:
 output_files[output_file] =input_file
 
-foroutput_file, input_fileinoutput_files.iteritems():
+foroutput_file, input_fileinoutput_files.items():
 output=open(output_file, 'w')
 pprint.pprint(data[input_file], output)
 output.close()

gyp/pylib/gyp/generator/make.py

@@ -674,7 +674,7 @@ def _ValidateSourcesForOSX(spec, all_sources):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1547,7 +1547,7 @@ def WriteTarget(self, spec, configs, deps, link_deps, bundle_deps,
 # Postbuilds expect to be run in the gyp file's directory, so insert an
 # implicit postbuild to cd to there.
 postbuilds.insert(0, gyp.common.EncodePOSIXShellList(['cd', self.path]))
-foriinxrange(len(postbuilds)):
+foriinrange(len(postbuilds)):
 ifnotpostbuilds[i].startswith('$'):
 postbuilds[i] =EscapeShellArgument(postbuilds[i])
 self.WriteLn('%s: builddir := $(abs_builddir)'%QuoteSpaces(self.output))

gyp/pylib/gyp/generator/msvs.py

@@ -451,7 +451,7 @@ def _AddCustomBuildToolForMSVS(p, spec, primary_input,
 'CommandLine': cmd,
  })
 # Add to the properties of primary input for each config.
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 p.AddFileConfig(_FixPath(primary_input),
 _ConfigFullName(config_name, c_data), tools=[tool])
 
@@ -971,7 +971,7 @@ def _ValidateSourcesForMSVSProject(spec, version):
 basenames.setdefault(basename, []).append(source)
 
 error=''
-forbasename, filesinbasenames.iteritems():
+forbasename, filesinbasenames.items():
 iflen(files) >1:
 error+=' %s: %s\n'% (basename, ' '.join(files))
 
@@ -1003,7 +1003,7 @@ def _GenerateMSVSProject(project, options, version, generator_flags):
 relative_path_of_gyp_file=gyp.common.RelativePath(gyp_path, project_dir)
 
 config_type=_GetMSVSConfigurationType(spec, project.build_file)
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config)
 
 # MSVC08 and prior version cannot handle duplicate basenames in the same
@@ -1369,10 +1369,10 @@ def _ConvertToolsToExpectedForm(tools):
  A list of Tool objects.
  """
 tool_list= []
-fortool, settingsintools.iteritems():
+fortool, settingsintools.items():
 # Collapse settings with lists.
 settings_fixed= {}
-forsetting, valueinsettings.iteritems():
+forsetting, valueinsettings.items():
 iftype(value) ==list:
 if ((tool=='VCLinkerTool'and
 setting=='AdditionalDependencies') or
@@ -1547,7 +1547,7 @@ def _IdlFilesHandledNonNatively(spec, sources):
 def_GetPrecompileRelatedFiles(spec):
 # Gather a list of precompiled header related sources.
 precompiled_related= []
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forkinprecomp_keys:
 f=config.get(k)
 iff:
@@ -1558,7 +1558,7 @@ def _GetPrecompileRelatedFiles(spec):
 def_ExcludeFilesFromBeingBuilt(p, spec, excluded_sources, excluded_idl,
 list_excluded):
 exclusions=_GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl)
-forfile_name, excluded_configsinexclusions.iteritems():
+forfile_name, excluded_configsinexclusions.items():
 if (notlist_excludedand
 len(excluded_configs) ==len(spec['configurations'])):
 # If we're not listing excluded files, then they won't appear in the
@@ -1575,7 +1575,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude excluded sources from being built.
 forfinexcluded_sources:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 precomped= [_FixPath(config.get(i, '')) foriinprecomp_keys]
 # Don't do this for ones that are precompiled header related.
 iffnotinprecomped:
@@ -1585,7 +1585,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 # Exclude them now.
 forfinexcluded_idl:
 excluded_configs= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 excluded_configs.append((config_name, config))
 exclusions[f] =excluded_configs
 returnexclusions
@@ -1594,7 +1594,7 @@ def _GetExcludedFilesFromBuild(spec, excluded_sources, excluded_idl):
 def_AddToolFilesToMSVS(p, spec):
 # Add in tool files (rules).
 tool_files=OrderedSet()
-for_, configinspec['configurations'].iteritems():
+for_, configinspec['configurations'].items():
 forfinconfig.get('msvs_tool_files', []):
 tool_files.add(f)
 forfintool_files:
@@ -1607,7 +1607,7 @@ def _HandlePreCompiledHeaders(p, sources, spec):
 # kind (i.e. C vs. C++) as the precompiled header source stub needs
 # to have use of precompiled headers disabled.
 extensions_excluded_from_precompile= []
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 source=config.get('msvs_precompiled_source')
 ifsource:
 source=_FixPath(source)
@@ -1628,7 +1628,7 @@ def DisableForSourceTree(source_tree):
 else:
 basename, extension=os.path.splitext(source)
 ifextensioninextensions_excluded_from_precompile:
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 tool=MSVSProject.Tool('VCCLCompilerTool',
  {'UsePrecompiledHeader': '0',
 'ForcedIncludeFiles': '$(NOINHERIT)'})
@@ -1679,7 +1679,7 @@ def _WriteMSVSUserFile(project_path, version, spec):
 return# Nothing to add
 # Write out the user file.
 user_file=_CreateMSVSUserFile(project_path, version, spec)
-forconfig_name, c_datainspec['configurations'].iteritems():
+forconfig_name, c_datainspec['configurations'].items():
 user_file.AddDebugSettings(_ConfigFullName(config_name, c_data),
 action, environment, working_directory)
 user_file.WriteIfChanged()
@@ -1730,7 +1730,7 @@ def _GetPathDict(root, path):
 def_DictsToFolders(base_path, bucket, flat):
 # Convert to folders recursively.
 children= []
-forfolder, contentsinbucket.iteritems():
+forfolder, contentsinbucket.items():
 iftype(contents) ==dict:
 folder_children=_DictsToFolders(os.path.join(base_path, folder),
 contents, flat)
@@ -1802,7 +1802,7 @@ def _GetPlatformOverridesOfProject(spec):
 # Prepare a dict indicating which project configurations are used for which
 # solution configurations for this target.
 config_platform_overrides= {}
-forconfig_name, cinspec['configurations'].iteritems():
+forconfig_name, cinspec['configurations'].items():
 config_fullname=_ConfigFullName(config_name, c)
 platform=c.get('msvs_target_platform', _ConfigPlatform(c))
 fixed_config_fullname='%s|%s'% (
@@ -1941,7 +1941,7 @@ def PerformBuild(data, configurations, params):
 msvs_version=params['msvs_version']
 devenv=os.path.join(msvs_version.path, 'Common7', 'IDE', 'devenv.com')
 
-forbuild_file, build_file_dictindata.iteritems():
+forbuild_file, build_file_dictindata.items():
  (build_file_root, build_file_ext) =os.path.splitext(build_file)
 ifbuild_file_ext!='.gyp':
 continue
@@ -1990,7 +1990,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
 configs=set()
 forqualified_targetintarget_list:
 spec=target_dicts[qualified_target]
-forconfig_name, configinspec['configurations'].iteritems():
+forconfig_name, configinspec['configurations'].items():
 configs.add(_ConfigFullName(config_name, config))
 configs=list(configs)
 
@@ -2630,7 +2630,7 @@ def _GetConfigurationCondition(name, settings):
 
 def_GetMSBuildProjectConfigurations(configurations):
 group= ['ItemGroup', {'Label': 'ProjectConfigurations'}]
-for (name, settings) insorted(configurations.iteritems()):
+for (name, settings) insorted(configurations.items()):
 configuration, platform=_GetConfigurationAndPlatform(name, settings)
 designation='%s|%s'% (configuration, platform)
 group.append(
@@ -2700,7 +2700,7 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
 
 def_GetMSBuildConfigurationDetails(spec, build_file):
 properties= {}
-forname, settingsinspec['configurations'].iteritems():
+forname, settingsinspec['configurations'].items():
 msbuild_attributes=_GetMSBuildAttributes(spec, settings, build_file)
 condition=_GetConfigurationCondition(name, settings)
 character_set=msbuild_attributes.get('CharacterSet')
@@ -2729,7 +2729,7 @@ def _GetMSBuildPropertySheets(configurations):
 user_props=r'$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props'
 additional_props= {}
 props_specified=False
-forname, settingsinsorted(configurations.iteritems()):
+forname, settingsinsorted(configurations.items()):
 configuration=_GetConfigurationCondition(name, settings)
 if'msbuild_props'insettings:
 additional_props[configuration] =_FixPaths(settings['msbuild_props'])
@@ -2751,7 +2751,7 @@ def _GetMSBuildPropertySheets(configurations):
  ]
 else:
 sheets= []
-forcondition, propsinadditional_props.iteritems():
+forcondition, propsinadditional_props.items():
 import_group= [
 'ImportGroup',
  {'Label': 'PropertySheets',
@@ -2878,7 +2878,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 new_paths='$(ExecutablePath);'+';'.join(new_paths)
 
 properties= {}
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 condition=_GetConfigurationCondition(name, configuration)
 attributes=_GetMSBuildAttributes(spec, configuration, build_file)
 msbuild_settings=configuration['finalized_msbuild_settings']
@@ -2903,7 +2903,7 @@ def _GetMSBuildConfigurationGlobalProperties(spec, configurations, build_file):
 _AddConditionalProperty(properties, condition, 'ExecutablePath',
 new_paths)
 tool_settings=msbuild_settings.get('', {})
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild('', name, value)
 _AddConditionalProperty(properties, condition, name, formatted_value)
 return_GetMSBuildPropertyGroup(spec, None, properties)
@@ -2972,7 +2972,7 @@ def GetEdges(node):
 # NOTE: reverse(topsort(DAG)) = topsort(reverse_edges(DAG))
 fornameinreversed(properties_ordered):
 values=properties[name]
-forvalue, conditionsinsorted(values.iteritems()):
+forvalue, conditionsinsorted(values.items()):
 iflen(conditions) ==num_configurations:
 # If the value is the same all configurations,
 # just add one unconditional entry.
@@ -2985,18 +2985,18 @@ def GetEdges(node):
 
 def_GetMSBuildToolSettingsSections(spec, configurations):
 groups= []
-for (name, configuration) insorted(configurations.iteritems()):
+for (name, configuration) insorted(configurations.items()):
 msbuild_settings=configuration['finalized_msbuild_settings']
 group= ['ItemDefinitionGroup',
  {'Condition': _GetConfigurationCondition(name, configuration)}
  ]
-fortool_name, tool_settingsinsorted(msbuild_settings.iteritems()):
+fortool_name, tool_settingsinsorted(msbuild_settings.items()):
 # Skip the tool named '' which is a holder of global settings handled
 # by _GetMSBuildConfigurationGlobalProperties.
 iftool_name:
 iftool_settings:
 tool= [tool_name]
-forname, valueinsorted(tool_settings.iteritems()):
+forname, valueinsorted(tool_settings.items()):
 formatted_value=_GetValueFormattedForMSBuild(tool_name, name,
 value)
 tool.append([name, formatted_value])
@@ -3196,7 +3196,7 @@ def _AddSources2(spec, sources, exclusions, grouped_sources,
  {'Condition': condition},
 'true'])
 # Add precompile if needed
-forconfig_name, configurationinspec['configurations'].iteritems():
+forconfig_name, configurationinspec['configurations'].items():
 precompiled_source=configuration.get('msvs_precompiled_source', '')
 ifprecompiled_source!='':
 precompiled_source=_FixPath(precompiled_source)
@@ -3436,7 +3436,7 @@ def _GenerateActionsForMSBuild(spec, actions_to_add):
  """
 sources_handled_by_action=OrderedSet()
 actions_spec= []
-forprimary_input, actionsinactions_to_add.iteritems():
+forprimary_input, actionsinactions_to_add.items():
 inputs=OrderedSet()
 outputs=OrderedSet()
 descriptions= []