gyp: get ready for python 3

#1335
Reviewed-By: Refael Ackermann <refack@gmail.com>

Author: cclauss

gyp/pylib/gyp/MSVSSettings.py

@@ -13,6 +13,7 @@
 The MSBuild schemas were also considered. They are typically found in the
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
+from __future__ importprint_function
 
 importsys
 importre
@@ -400,7 +401,7 @@ def _ValidateExclusionSetting(setting, settings, error_msg, stderr=sys.stderr):
 
 ifunrecognized:
 # We don't know this setting. Give a warning.
-print>>stderr, error_msg
+print(error_msg, file=stderr)
 
 
 defFixVCMacroSlashes(s):
@@ -461,9 +462,9 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
 # Invoke the translation function.
 try:
 msvs_tool[msvs_setting](msvs_value, msbuild_settings)
-exceptValueError,e:
-print>>stderr, ('Warning: while converting %s/%s to MSBuild, '
-'%s'% (msvs_tool_name, msvs_setting, e))
+exceptValueErrorase:
+print(('Warning: while converting %s/%s to MSBuild, '
+'%s'% (msvs_tool_name, msvs_setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(msvs_setting,
 msvs_tool,
@@ -472,8 +473,8 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  (msvs_tool_name, msvs_setting)),
 stderr)
 else:
-print>>stderr, ('Warning: unrecognized tool %s while converting to '
-'MSBuild.'%msvs_tool_name)
+print(('Warning: unrecognized tool %s while converting to '
+'MSBuild.'%msvs_tool_name), file=stderr)
 returnmsbuild_settings
 
 
@@ -517,9 +518,9 @@ def _ValidateSettings(validators, settings, stderr):
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)
-exceptValueError,e:
-print>>stderr, ('Warning: for %s/%s, %s'%
- (tool_name, setting, e))
+exceptValueErrorase:
+print(('Warning: for %s/%s, %s'%
+ (tool_name, setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(setting,
 tool_validators,
@@ -528,7 +529,7 @@ def _ValidateSettings(validators, settings, stderr):
 stderr)
 
 else:
-print>>stderr, ('Warning: unrecognized tool %s'%tool_name)
+print(('Warning: unrecognized tool %s'%tool_name), file=stderr)
 
 
 # MSVS and MBuild names of the tools.

gyp/pylib/gyp/MSVSVersion.py

@@ -158,7 +158,7 @@ def _RegistryQuery(key, value=None):
 text=None
 try:
 text=_RegistryQueryBase('Sysnative', key, value)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno==errno.ENOENT:
 text=_RegistryQueryBase('System32', key, value)
 else:

gyp/pylib/gyp/__init__.py

@@ -4,6 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ importprint_function
 importcopy
 importgyp.input
 importoptparse
@@ -34,8 +35,8 @@ def DebugOutput(mode, message, *args):
 pass
 ifargs:
 message%=args
-print'%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
-ctx[1], ctx[2], message)
+print('%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
+ctx[1], ctx[2], message))
 
 defFindBuildFiles():
 extension='.gyp'
@@ -226,12 +227,12 @@ def Noop(value):
  (action=='store_false'andnotvalue)):
 flags.append(opt)
 elifoptions.use_environmentandenv_name:
-print>>sys.stderr, ('Warning: environment regeneration unimplemented '
+print(('Warning: environment regeneration unimplemented '
 'for %s flag %r env_name %r'% (action, opt,
-env_name))
+env_name)), file=sys.stderr)
 else:
-print>>sys.stderr, ('Warning: regeneration unimplemented for action %r '
-'flag %r'% (action, opt))
+print(('Warning: regeneration unimplemented for action %r '
+'flag %r'% (action, opt)), file=sys.stderr)
 
 returnflags
 
@@ -475,7 +476,7 @@ def gyp_main(args):
 ifhome_dot_gyp!=None:
 default_include=os.path.join(home_dot_gyp, 'include.gypi')
 ifos.path.exists(default_include):
-print'Using overrides found in '+default_include
+print('Using overrides found in '+default_include)
 includes.append(default_include)
 
 # Command-line --include files come after the default include.
@@ -536,7 +537,7 @@ def gyp_main(args):
 defmain(args):
 try:
 returngyp_main(args)
-exceptGypError,e:
+exceptGypErrorase:
 sys.stderr.write("gyp: %s\n"%e)
 return1
 

gyp/pylib/gyp/common.py

@@ -363,7 +363,7 @@ def close(self):
 same=False
 try:
 same=filecmp.cmp(self.tmp_path, filename, False)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno!=errno.ENOENT:
 raise
 
@@ -382,9 +382,9 @@ def close(self):
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
-umask=os.umask(077)
+umask=os.umask(0o77)
 os.umask(umask)
-os.chmod(self.tmp_path, 0666&~umask)
+os.chmod(self.tmp_path, 0o666&~umask)
 ifsys.platform=='win32'andos.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
@@ -464,7 +464,7 @@ def CopyTool(flavor, out_path):
 ''.join([source[0], '# Generated by gyp. Do not edit.\n'] +source[1:]))
 
 # Make file executable.
-os.chmod(tool_path, 0755)
+os.chmod(tool_path, 0o755)
 
 
 # From Alex Martelli,

gyp/pylib/gyp/easy_xml.py

@@ -5,6 +5,7 @@
 importre
 importos
 importlocale
+fromfunctoolsimportreduce
 
 
 defXmlToString(content, encoding='utf-8', pretty=False):

gyp/pylib/gyp/flock_tool.py

@@ -39,7 +39,7 @@ def ExecFlock(self, lockfile, *cmd_list):
 # where fcntl.flock(fd, LOCK_EX) always fails
 # with EBADF, that's why we use this F_SETLK
 # hack instead.
-fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0666)
+fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
 ifsys.platform.startswith('aix'):
 # Python on AIX is compiled with LARGEFILE support, which changes the
 # struct size.

gyp/pylib/gyp/MSVSSettings.py

@@ -13,6 +13,7 @@
 The MSBuild schemas were also considered. They are typically found in the
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
+from __future__ importprint_function
 
 importsys
 importre
@@ -400,7 +401,7 @@ def _ValidateExclusionSetting(setting, settings, error_msg, stderr=sys.stderr):
 
 ifunrecognized:
 # We don't know this setting. Give a warning.
-print>>stderr, error_msg
+print(error_msg, file=stderr)
 
 
 defFixVCMacroSlashes(s):
@@ -461,9 +462,9 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
 # Invoke the translation function.
 try:
 msvs_tool[msvs_setting](msvs_value, msbuild_settings)
-exceptValueError,e:
-print>>stderr, ('Warning: while converting %s/%s to MSBuild, '
-'%s'% (msvs_tool_name, msvs_setting, e))
+exceptValueErrorase:
+print(('Warning: while converting %s/%s to MSBuild, '
+'%s'% (msvs_tool_name, msvs_setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(msvs_setting,
 msvs_tool,
@@ -472,8 +473,8 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  (msvs_tool_name, msvs_setting)),
 stderr)
 else:
-print>>stderr, ('Warning: unrecognized tool %s while converting to '
-'MSBuild.'%msvs_tool_name)
+print(('Warning: unrecognized tool %s while converting to '
+'MSBuild.'%msvs_tool_name), file=stderr)
 returnmsbuild_settings
 
 
@@ -517,9 +518,9 @@ def _ValidateSettings(validators, settings, stderr):
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)
-exceptValueError,e:
-print>>stderr, ('Warning: for %s/%s, %s'%
- (tool_name, setting, e))
+exceptValueErrorase:
+print(('Warning: for %s/%s, %s'%
+ (tool_name, setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(setting,
 tool_validators,
@@ -528,7 +529,7 @@ def _ValidateSettings(validators, settings, stderr):
 stderr)
 
 else:
-print>>stderr, ('Warning: unrecognized tool %s'%tool_name)
+print(('Warning: unrecognized tool %s'%tool_name), file=stderr)
 
 
 # MSVS and MBuild names of the tools.

gyp/pylib/gyp/MSVSVersion.py

@@ -158,7 +158,7 @@ def _RegistryQuery(key, value=None):
 text=None
 try:
 text=_RegistryQueryBase('Sysnative', key, value)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno==errno.ENOENT:
 text=_RegistryQueryBase('System32', key, value)
 else:

gyp/pylib/gyp/__init__.py

@@ -4,6 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ importprint_function
 importcopy
 importgyp.input
 importoptparse
@@ -34,8 +35,8 @@ def DebugOutput(mode, message, *args):
 pass
 ifargs:
 message%=args
-print'%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
-ctx[1], ctx[2], message)
+print('%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
+ctx[1], ctx[2], message))
 
 defFindBuildFiles():
 extension='.gyp'
@@ -226,12 +227,12 @@ def Noop(value):
  (action=='store_false'andnotvalue)):
 flags.append(opt)
 elifoptions.use_environmentandenv_name:
-print>>sys.stderr, ('Warning: environment regeneration unimplemented '
+print(('Warning: environment regeneration unimplemented '
 'for %s flag %r env_name %r'% (action, opt,
-env_name))
+env_name)), file=sys.stderr)
 else:
-print>>sys.stderr, ('Warning: regeneration unimplemented for action %r '
-'flag %r'% (action, opt))
+print(('Warning: regeneration unimplemented for action %r '
+'flag %r'% (action, opt)), file=sys.stderr)
 
 returnflags
 
@@ -475,7 +476,7 @@ def gyp_main(args):
 ifhome_dot_gyp!=None:
 default_include=os.path.join(home_dot_gyp, 'include.gypi')
 ifos.path.exists(default_include):
-print'Using overrides found in '+default_include
+print('Using overrides found in '+default_include)
 includes.append(default_include)
 
 # Command-line --include files come after the default include.
@@ -536,7 +537,7 @@ def gyp_main(args):
 defmain(args):
 try:
 returngyp_main(args)
-exceptGypError,e:
+exceptGypErrorase:
 sys.stderr.write("gyp: %s\n"%e)
 return1
 

gyp/pylib/gyp/common.py

@@ -363,7 +363,7 @@ def close(self):
 same=False
 try:
 same=filecmp.cmp(self.tmp_path, filename, False)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno!=errno.ENOENT:
 raise
 
@@ -382,9 +382,9 @@ def close(self):
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
-umask=os.umask(077)
+umask=os.umask(0o77)
 os.umask(umask)
-os.chmod(self.tmp_path, 0666&~umask)
+os.chmod(self.tmp_path, 0o666&~umask)
 ifsys.platform=='win32'andos.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
@@ -464,7 +464,7 @@ def CopyTool(flavor, out_path):
 ''.join([source[0], '# Generated by gyp. Do not edit.\n'] +source[1:]))
 
 # Make file executable.
-os.chmod(tool_path, 0755)
+os.chmod(tool_path, 0o755)
 
 
 # From Alex Martelli,

gyp/pylib/gyp/easy_xml.py

@@ -5,6 +5,7 @@
 importre
 importos
 importlocale
+fromfunctoolsimportreduce
 
 
 defXmlToString(content, encoding='utf-8', pretty=False):

gyp/pylib/gyp/flock_tool.py

@@ -39,7 +39,7 @@ def ExecFlock(self, lockfile, *cmd_list):
 # where fcntl.flock(fd, LOCK_EX) always fails
 # with EBADF, that's why we use this F_SETLK
 # hack instead.
-fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0666)
+fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
 ifsys.platform.startswith('aix'):
 # Python on AIX is compiled with LARGEFILE support, which changes the
 # struct size.

gyp/pylib/gyp/MSVSSettings.py

@@ -13,6 +13,7 @@
 The MSBuild schemas were also considered. They are typically found in the
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
+from __future__ importprint_function
 
 importsys
 importre
@@ -400,7 +401,7 @@ def _ValidateExclusionSetting(setting, settings, error_msg, stderr=sys.stderr):
 
 ifunrecognized:
 # We don't know this setting. Give a warning.
-print>>stderr, error_msg
+print(error_msg, file=stderr)
 
 
 defFixVCMacroSlashes(s):
@@ -461,9 +462,9 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
 # Invoke the translation function.
 try:
 msvs_tool[msvs_setting](msvs_value, msbuild_settings)
-exceptValueError,e:
-print>>stderr, ('Warning: while converting %s/%s to MSBuild, '
-'%s'% (msvs_tool_name, msvs_setting, e))
+exceptValueErrorase:
+print(('Warning: while converting %s/%s to MSBuild, '
+'%s'% (msvs_tool_name, msvs_setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(msvs_setting,
 msvs_tool,
@@ -472,8 +473,8 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  (msvs_tool_name, msvs_setting)),
 stderr)
 else:
-print>>stderr, ('Warning: unrecognized tool %s while converting to '
-'MSBuild.'%msvs_tool_name)
+print(('Warning: unrecognized tool %s while converting to '
+'MSBuild.'%msvs_tool_name), file=stderr)
 returnmsbuild_settings
 
 
@@ -517,9 +518,9 @@ def _ValidateSettings(validators, settings, stderr):
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)
-exceptValueError,e:
-print>>stderr, ('Warning: for %s/%s, %s'%
- (tool_name, setting, e))
+exceptValueErrorase:
+print(('Warning: for %s/%s, %s'%
+ (tool_name, setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(setting,
 tool_validators,
@@ -528,7 +529,7 @@ def _ValidateSettings(validators, settings, stderr):
 stderr)
 
 else:
-print>>stderr, ('Warning: unrecognized tool %s'%tool_name)
+print(('Warning: unrecognized tool %s'%tool_name), file=stderr)
 
 
 # MSVS and MBuild names of the tools.

gyp/pylib/gyp/MSVSVersion.py

@@ -158,7 +158,7 @@ def _RegistryQuery(key, value=None):
 text=None
 try:
 text=_RegistryQueryBase('Sysnative', key, value)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno==errno.ENOENT:
 text=_RegistryQueryBase('System32', key, value)
 else:

gyp/pylib/gyp/__init__.py

@@ -4,6 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ importprint_function
 importcopy
 importgyp.input
 importoptparse
@@ -34,8 +35,8 @@ def DebugOutput(mode, message, *args):
 pass
 ifargs:
 message%=args
-print'%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
-ctx[1], ctx[2], message)
+print('%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
+ctx[1], ctx[2], message))
 
 defFindBuildFiles():
 extension='.gyp'
@@ -226,12 +227,12 @@ def Noop(value):
  (action=='store_false'andnotvalue)):
 flags.append(opt)
 elifoptions.use_environmentandenv_name:
-print>>sys.stderr, ('Warning: environment regeneration unimplemented '
+print(('Warning: environment regeneration unimplemented '
 'for %s flag %r env_name %r'% (action, opt,
-env_name))
+env_name)), file=sys.stderr)
 else:
-print>>sys.stderr, ('Warning: regeneration unimplemented for action %r '
-'flag %r'% (action, opt))
+print(('Warning: regeneration unimplemented for action %r '
+'flag %r'% (action, opt)), file=sys.stderr)
 
 returnflags
 
@@ -475,7 +476,7 @@ def gyp_main(args):
 ifhome_dot_gyp!=None:
 default_include=os.path.join(home_dot_gyp, 'include.gypi')
 ifos.path.exists(default_include):
-print'Using overrides found in '+default_include
+print('Using overrides found in '+default_include)
 includes.append(default_include)
 
 # Command-line --include files come after the default include.
@@ -536,7 +537,7 @@ def gyp_main(args):
 defmain(args):
 try:
 returngyp_main(args)
-exceptGypError,e:
+exceptGypErrorase:
 sys.stderr.write("gyp: %s\n"%e)
 return1
 

gyp/pylib/gyp/common.py

@@ -363,7 +363,7 @@ def close(self):
 same=False
 try:
 same=filecmp.cmp(self.tmp_path, filename, False)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno!=errno.ENOENT:
 raise
 
@@ -382,9 +382,9 @@ def close(self):
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
-umask=os.umask(077)
+umask=os.umask(0o77)
 os.umask(umask)
-os.chmod(self.tmp_path, 0666&~umask)
+os.chmod(self.tmp_path, 0o666&~umask)
 ifsys.platform=='win32'andos.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
@@ -464,7 +464,7 @@ def CopyTool(flavor, out_path):
 ''.join([source[0], '# Generated by gyp. Do not edit.\n'] +source[1:]))
 
 # Make file executable.
-os.chmod(tool_path, 0755)
+os.chmod(tool_path, 0o755)
 
 
 # From Alex Martelli,

gyp/pylib/gyp/easy_xml.py

@@ -5,6 +5,7 @@
 importre
 importos
 importlocale
+fromfunctoolsimportreduce
 
 
 defXmlToString(content, encoding='utf-8', pretty=False):

gyp/pylib/gyp/flock_tool.py

@@ -39,7 +39,7 @@ def ExecFlock(self, lockfile, *cmd_list):
 # where fcntl.flock(fd, LOCK_EX) always fails
 # with EBADF, that's why we use this F_SETLK
 # hack instead.
-fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0666)
+fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
 ifsys.platform.startswith('aix'):
 # Python on AIX is compiled with LARGEFILE support, which changes the
 # struct size.

gyp/pylib/gyp/MSVSSettings.py

@@ -13,6 +13,7 @@
 The MSBuild schemas were also considered. They are typically found in the
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
+from __future__ importprint_function
 
 importsys
 importre
@@ -400,7 +401,7 @@ def _ValidateExclusionSetting(setting, settings, error_msg, stderr=sys.stderr):
 
 ifunrecognized:
 # We don't know this setting. Give a warning.
-print>>stderr, error_msg
+print(error_msg, file=stderr)
 
 
 defFixVCMacroSlashes(s):
@@ -461,9 +462,9 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
 # Invoke the translation function.
 try:
 msvs_tool[msvs_setting](msvs_value, msbuild_settings)
-exceptValueError,e:
-print>>stderr, ('Warning: while converting %s/%s to MSBuild, '
-'%s'% (msvs_tool_name, msvs_setting, e))
+exceptValueErrorase:
+print(('Warning: while converting %s/%s to MSBuild, '
+'%s'% (msvs_tool_name, msvs_setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(msvs_setting,
 msvs_tool,
@@ -472,8 +473,8 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  (msvs_tool_name, msvs_setting)),
 stderr)
 else:
-print>>stderr, ('Warning: unrecognized tool %s while converting to '
-'MSBuild.'%msvs_tool_name)
+print(('Warning: unrecognized tool %s while converting to '
+'MSBuild.'%msvs_tool_name), file=stderr)
 returnmsbuild_settings
 
 
@@ -517,9 +518,9 @@ def _ValidateSettings(validators, settings, stderr):
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)
-exceptValueError,e:
-print>>stderr, ('Warning: for %s/%s, %s'%
- (tool_name, setting, e))
+exceptValueErrorase:
+print(('Warning: for %s/%s, %s'%
+ (tool_name, setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(setting,
 tool_validators,
@@ -528,7 +529,7 @@ def _ValidateSettings(validators, settings, stderr):
 stderr)
 
 else:
-print>>stderr, ('Warning: unrecognized tool %s'%tool_name)
+print(('Warning: unrecognized tool %s'%tool_name), file=stderr)
 
 
 # MSVS and MBuild names of the tools.

gyp/pylib/gyp/MSVSVersion.py

@@ -158,7 +158,7 @@ def _RegistryQuery(key, value=None):
 text=None
 try:
 text=_RegistryQueryBase('Sysnative', key, value)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno==errno.ENOENT:
 text=_RegistryQueryBase('System32', key, value)
 else:

gyp/pylib/gyp/__init__.py

@@ -4,6 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ importprint_function
 importcopy
 importgyp.input
 importoptparse
@@ -34,8 +35,8 @@ def DebugOutput(mode, message, *args):
 pass
 ifargs:
 message%=args
-print'%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
-ctx[1], ctx[2], message)
+print('%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
+ctx[1], ctx[2], message))
 
 defFindBuildFiles():
 extension='.gyp'
@@ -226,12 +227,12 @@ def Noop(value):
  (action=='store_false'andnotvalue)):
 flags.append(opt)
 elifoptions.use_environmentandenv_name:
-print>>sys.stderr, ('Warning: environment regeneration unimplemented '
+print(('Warning: environment regeneration unimplemented '
 'for %s flag %r env_name %r'% (action, opt,
-env_name))
+env_name)), file=sys.stderr)
 else:
-print>>sys.stderr, ('Warning: regeneration unimplemented for action %r '
-'flag %r'% (action, opt))
+print(('Warning: regeneration unimplemented for action %r '
+'flag %r'% (action, opt)), file=sys.stderr)
 
 returnflags
 
@@ -475,7 +476,7 @@ def gyp_main(args):
 ifhome_dot_gyp!=None:
 default_include=os.path.join(home_dot_gyp, 'include.gypi')
 ifos.path.exists(default_include):
-print'Using overrides found in '+default_include
+print('Using overrides found in '+default_include)
 includes.append(default_include)
 
 # Command-line --include files come after the default include.
@@ -536,7 +537,7 @@ def gyp_main(args):
 defmain(args):
 try:
 returngyp_main(args)
-exceptGypError,e:
+exceptGypErrorase:
 sys.stderr.write("gyp: %s\n"%e)
 return1
 

gyp/pylib/gyp/common.py

@@ -363,7 +363,7 @@ def close(self):
 same=False
 try:
 same=filecmp.cmp(self.tmp_path, filename, False)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno!=errno.ENOENT:
 raise
 
@@ -382,9 +382,9 @@ def close(self):
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
-umask=os.umask(077)
+umask=os.umask(0o77)
 os.umask(umask)
-os.chmod(self.tmp_path, 0666&~umask)
+os.chmod(self.tmp_path, 0o666&~umask)
 ifsys.platform=='win32'andos.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
@@ -464,7 +464,7 @@ def CopyTool(flavor, out_path):
 ''.join([source[0], '# Generated by gyp. Do not edit.\n'] +source[1:]))
 
 # Make file executable.
-os.chmod(tool_path, 0755)
+os.chmod(tool_path, 0o755)
 
 
 # From Alex Martelli,

gyp/pylib/gyp/easy_xml.py

@@ -5,6 +5,7 @@
 importre
 importos
 importlocale
+fromfunctoolsimportreduce
 
 
 defXmlToString(content, encoding='utf-8', pretty=False):

gyp/pylib/gyp/flock_tool.py

@@ -39,7 +39,7 @@ def ExecFlock(self, lockfile, *cmd_list):
 # where fcntl.flock(fd, LOCK_EX) always fails
 # with EBADF, that's why we use this F_SETLK
 # hack instead.
-fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0666)
+fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
 ifsys.platform.startswith('aix'):
 # Python on AIX is compiled with LARGEFILE support, which changes the
 # struct size.

gyp/pylib/gyp/MSVSSettings.py

@@ -13,6 +13,7 @@
 The MSBuild schemas were also considered. They are typically found in the
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
+from __future__ importprint_function
 
 importsys
 importre
@@ -400,7 +401,7 @@ def _ValidateExclusionSetting(setting, settings, error_msg, stderr=sys.stderr):
 
 ifunrecognized:
 # We don't know this setting. Give a warning.
-print>>stderr, error_msg
+print(error_msg, file=stderr)
 
 
 defFixVCMacroSlashes(s):
@@ -461,9 +462,9 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
 # Invoke the translation function.
 try:
 msvs_tool[msvs_setting](msvs_value, msbuild_settings)
-exceptValueError,e:
-print>>stderr, ('Warning: while converting %s/%s to MSBuild, '
-'%s'% (msvs_tool_name, msvs_setting, e))
+exceptValueErrorase:
+print(('Warning: while converting %s/%s to MSBuild, '
+'%s'% (msvs_tool_name, msvs_setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(msvs_setting,
 msvs_tool,
@@ -472,8 +473,8 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  (msvs_tool_name, msvs_setting)),
 stderr)
 else:
-print>>stderr, ('Warning: unrecognized tool %s while converting to '
-'MSBuild.'%msvs_tool_name)
+print(('Warning: unrecognized tool %s while converting to '
+'MSBuild.'%msvs_tool_name), file=stderr)
 returnmsbuild_settings
 
 
@@ -517,9 +518,9 @@ def _ValidateSettings(validators, settings, stderr):
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)
-exceptValueError,e:
-print>>stderr, ('Warning: for %s/%s, %s'%
- (tool_name, setting, e))
+exceptValueErrorase:
+print(('Warning: for %s/%s, %s'%
+ (tool_name, setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(setting,
 tool_validators,
@@ -528,7 +529,7 @@ def _ValidateSettings(validators, settings, stderr):
 stderr)
 
 else:
-print>>stderr, ('Warning: unrecognized tool %s'%tool_name)
+print(('Warning: unrecognized tool %s'%tool_name), file=stderr)
 
 
 # MSVS and MBuild names of the tools.

gyp/pylib/gyp/MSVSVersion.py

@@ -158,7 +158,7 @@ def _RegistryQuery(key, value=None):
 text=None
 try:
 text=_RegistryQueryBase('Sysnative', key, value)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno==errno.ENOENT:
 text=_RegistryQueryBase('System32', key, value)
 else:

gyp/pylib/gyp/__init__.py

@@ -4,6 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ importprint_function
 importcopy
 importgyp.input
 importoptparse
@@ -34,8 +35,8 @@ def DebugOutput(mode, message, *args):
 pass
 ifargs:
 message%=args
-print'%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
-ctx[1], ctx[2], message)
+print('%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
+ctx[1], ctx[2], message))
 
 defFindBuildFiles():
 extension='.gyp'
@@ -226,12 +227,12 @@ def Noop(value):
  (action=='store_false'andnotvalue)):
 flags.append(opt)
 elifoptions.use_environmentandenv_name:
-print>>sys.stderr, ('Warning: environment regeneration unimplemented '
+print(('Warning: environment regeneration unimplemented '
 'for %s flag %r env_name %r'% (action, opt,
-env_name))
+env_name)), file=sys.stderr)
 else:
-print>>sys.stderr, ('Warning: regeneration unimplemented for action %r '
-'flag %r'% (action, opt))
+print(('Warning: regeneration unimplemented for action %r '
+'flag %r'% (action, opt)), file=sys.stderr)
 
 returnflags
 
@@ -475,7 +476,7 @@ def gyp_main(args):
 ifhome_dot_gyp!=None:
 default_include=os.path.join(home_dot_gyp, 'include.gypi')
 ifos.path.exists(default_include):
-print'Using overrides found in '+default_include
+print('Using overrides found in '+default_include)
 includes.append(default_include)
 
 # Command-line --include files come after the default include.
@@ -536,7 +537,7 @@ def gyp_main(args):
 defmain(args):
 try:
 returngyp_main(args)
-exceptGypError,e:
+exceptGypErrorase:
 sys.stderr.write("gyp: %s\n"%e)
 return1
 

gyp/pylib/gyp/common.py

@@ -363,7 +363,7 @@ def close(self):
 same=False
 try:
 same=filecmp.cmp(self.tmp_path, filename, False)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno!=errno.ENOENT:
 raise
 
@@ -382,9 +382,9 @@ def close(self):
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
-umask=os.umask(077)
+umask=os.umask(0o77)
 os.umask(umask)
-os.chmod(self.tmp_path, 0666&~umask)
+os.chmod(self.tmp_path, 0o666&~umask)
 ifsys.platform=='win32'andos.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
@@ -464,7 +464,7 @@ def CopyTool(flavor, out_path):
 ''.join([source[0], '# Generated by gyp. Do not edit.\n'] +source[1:]))
 
 # Make file executable.
-os.chmod(tool_path, 0755)
+os.chmod(tool_path, 0o755)
 
 
 # From Alex Martelli,

gyp/pylib/gyp/easy_xml.py

@@ -5,6 +5,7 @@
 importre
 importos
 importlocale
+fromfunctoolsimportreduce
 
 
 defXmlToString(content, encoding='utf-8', pretty=False):

gyp/pylib/gyp/flock_tool.py

@@ -39,7 +39,7 @@ def ExecFlock(self, lockfile, *cmd_list):
 # where fcntl.flock(fd, LOCK_EX) always fails
 # with EBADF, that's why we use this F_SETLK
 # hack instead.
-fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0666)
+fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
 ifsys.platform.startswith('aix'):
 # Python on AIX is compiled with LARGEFILE support, which changes the
 # struct size.

gyp/pylib/gyp/MSVSSettings.py

@@ -13,6 +13,7 @@
 The MSBuild schemas were also considered. They are typically found in the
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
+from __future__ importprint_function
 
 importsys
 importre
@@ -400,7 +401,7 @@ def _ValidateExclusionSetting(setting, settings, error_msg, stderr=sys.stderr):
 
 ifunrecognized:
 # We don't know this setting. Give a warning.
-print>>stderr, error_msg
+print(error_msg, file=stderr)
 
 
 defFixVCMacroSlashes(s):
@@ -461,9 +462,9 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
 # Invoke the translation function.
 try:
 msvs_tool[msvs_setting](msvs_value, msbuild_settings)
-exceptValueError,e:
-print>>stderr, ('Warning: while converting %s/%s to MSBuild, '
-'%s'% (msvs_tool_name, msvs_setting, e))
+exceptValueErrorase:
+print(('Warning: while converting %s/%s to MSBuild, '
+'%s'% (msvs_tool_name, msvs_setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(msvs_setting,
 msvs_tool,
@@ -472,8 +473,8 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  (msvs_tool_name, msvs_setting)),
 stderr)
 else:
-print>>stderr, ('Warning: unrecognized tool %s while converting to '
-'MSBuild.'%msvs_tool_name)
+print(('Warning: unrecognized tool %s while converting to '
+'MSBuild.'%msvs_tool_name), file=stderr)
 returnmsbuild_settings
 
 
@@ -517,9 +518,9 @@ def _ValidateSettings(validators, settings, stderr):
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)
-exceptValueError,e:
-print>>stderr, ('Warning: for %s/%s, %s'%
- (tool_name, setting, e))
+exceptValueErrorase:
+print(('Warning: for %s/%s, %s'%
+ (tool_name, setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(setting,
 tool_validators,
@@ -528,7 +529,7 @@ def _ValidateSettings(validators, settings, stderr):
 stderr)
 
 else:
-print>>stderr, ('Warning: unrecognized tool %s'%tool_name)
+print(('Warning: unrecognized tool %s'%tool_name), file=stderr)
 
 
 # MSVS and MBuild names of the tools.

gyp/pylib/gyp/MSVSVersion.py

@@ -158,7 +158,7 @@ def _RegistryQuery(key, value=None):
 text=None
 try:
 text=_RegistryQueryBase('Sysnative', key, value)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno==errno.ENOENT:
 text=_RegistryQueryBase('System32', key, value)
 else:

gyp/pylib/gyp/__init__.py

@@ -4,6 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ importprint_function
 importcopy
 importgyp.input
 importoptparse
@@ -34,8 +35,8 @@ def DebugOutput(mode, message, *args):
 pass
 ifargs:
 message%=args
-print'%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
-ctx[1], ctx[2], message)
+print('%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
+ctx[1], ctx[2], message))
 
 defFindBuildFiles():
 extension='.gyp'
@@ -226,12 +227,12 @@ def Noop(value):
  (action=='store_false'andnotvalue)):
 flags.append(opt)
 elifoptions.use_environmentandenv_name:
-print>>sys.stderr, ('Warning: environment regeneration unimplemented '
+print(('Warning: environment regeneration unimplemented '
 'for %s flag %r env_name %r'% (action, opt,
-env_name))
+env_name)), file=sys.stderr)
 else:
-print>>sys.stderr, ('Warning: regeneration unimplemented for action %r '
-'flag %r'% (action, opt))
+print(('Warning: regeneration unimplemented for action %r '
+'flag %r'% (action, opt)), file=sys.stderr)
 
 returnflags
 
@@ -475,7 +476,7 @@ def gyp_main(args):
 ifhome_dot_gyp!=None:
 default_include=os.path.join(home_dot_gyp, 'include.gypi')
 ifos.path.exists(default_include):
-print'Using overrides found in '+default_include
+print('Using overrides found in '+default_include)
 includes.append(default_include)
 
 # Command-line --include files come after the default include.
@@ -536,7 +537,7 @@ def gyp_main(args):
 defmain(args):
 try:
 returngyp_main(args)
-exceptGypError,e:
+exceptGypErrorase:
 sys.stderr.write("gyp: %s\n"%e)
 return1
 

gyp/pylib/gyp/common.py

@@ -363,7 +363,7 @@ def close(self):
 same=False
 try:
 same=filecmp.cmp(self.tmp_path, filename, False)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno!=errno.ENOENT:
 raise
 
@@ -382,9 +382,9 @@ def close(self):
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
-umask=os.umask(077)
+umask=os.umask(0o77)
 os.umask(umask)
-os.chmod(self.tmp_path, 0666&~umask)
+os.chmod(self.tmp_path, 0o666&~umask)
 ifsys.platform=='win32'andos.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
@@ -464,7 +464,7 @@ def CopyTool(flavor, out_path):
 ''.join([source[0], '# Generated by gyp. Do not edit.\n'] +source[1:]))
 
 # Make file executable.
-os.chmod(tool_path, 0755)
+os.chmod(tool_path, 0o755)
 
 
 # From Alex Martelli,

gyp/pylib/gyp/easy_xml.py

@@ -5,6 +5,7 @@
 importre
 importos
 importlocale
+fromfunctoolsimportreduce
 
 
 defXmlToString(content, encoding='utf-8', pretty=False):

gyp/pylib/gyp/flock_tool.py

@@ -39,7 +39,7 @@ def ExecFlock(self, lockfile, *cmd_list):
 # where fcntl.flock(fd, LOCK_EX) always fails
 # with EBADF, that's why we use this F_SETLK
 # hack instead.
-fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0666)
+fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
 ifsys.platform.startswith('aix'):
 # Python on AIX is compiled with LARGEFILE support, which changes the
 # struct size.

gyp/pylib/gyp/MSVSSettings.py

@@ -13,6 +13,7 @@
 The MSBuild schemas were also considered. They are typically found in the
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
+from __future__ importprint_function
 
 importsys
 importre
@@ -400,7 +401,7 @@ def _ValidateExclusionSetting(setting, settings, error_msg, stderr=sys.stderr):
 
 ifunrecognized:
 # We don't know this setting. Give a warning.
-print>>stderr, error_msg
+print(error_msg, file=stderr)
 
 
 defFixVCMacroSlashes(s):
@@ -461,9 +462,9 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
 # Invoke the translation function.
 try:
 msvs_tool[msvs_setting](msvs_value, msbuild_settings)
-exceptValueError,e:
-print>>stderr, ('Warning: while converting %s/%s to MSBuild, '
-'%s'% (msvs_tool_name, msvs_setting, e))
+exceptValueErrorase:
+print(('Warning: while converting %s/%s to MSBuild, '
+'%s'% (msvs_tool_name, msvs_setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(msvs_setting,
 msvs_tool,
@@ -472,8 +473,8 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  (msvs_tool_name, msvs_setting)),
 stderr)
 else:
-print>>stderr, ('Warning: unrecognized tool %s while converting to '
-'MSBuild.'%msvs_tool_name)
+print(('Warning: unrecognized tool %s while converting to '
+'MSBuild.'%msvs_tool_name), file=stderr)
 returnmsbuild_settings
 
 
@@ -517,9 +518,9 @@ def _ValidateSettings(validators, settings, stderr):
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)
-exceptValueError,e:
-print>>stderr, ('Warning: for %s/%s, %s'%
- (tool_name, setting, e))
+exceptValueErrorase:
+print(('Warning: for %s/%s, %s'%
+ (tool_name, setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(setting,
 tool_validators,
@@ -528,7 +529,7 @@ def _ValidateSettings(validators, settings, stderr):
 stderr)
 
 else:
-print>>stderr, ('Warning: unrecognized tool %s'%tool_name)
+print(('Warning: unrecognized tool %s'%tool_name), file=stderr)
 
 
 # MSVS and MBuild names of the tools.

gyp/pylib/gyp/MSVSVersion.py

@@ -158,7 +158,7 @@ def _RegistryQuery(key, value=None):
 text=None
 try:
 text=_RegistryQueryBase('Sysnative', key, value)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno==errno.ENOENT:
 text=_RegistryQueryBase('System32', key, value)
 else:

gyp/pylib/gyp/__init__.py

@@ -4,6 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ importprint_function
 importcopy
 importgyp.input
 importoptparse
@@ -34,8 +35,8 @@ def DebugOutput(mode, message, *args):
 pass
 ifargs:
 message%=args
-print'%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
-ctx[1], ctx[2], message)
+print('%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
+ctx[1], ctx[2], message))
 
 defFindBuildFiles():
 extension='.gyp'
@@ -226,12 +227,12 @@ def Noop(value):
  (action=='store_false'andnotvalue)):
 flags.append(opt)
 elifoptions.use_environmentandenv_name:
-print>>sys.stderr, ('Warning: environment regeneration unimplemented '
+print(('Warning: environment regeneration unimplemented '
 'for %s flag %r env_name %r'% (action, opt,
-env_name))
+env_name)), file=sys.stderr)
 else:
-print>>sys.stderr, ('Warning: regeneration unimplemented for action %r '
-'flag %r'% (action, opt))
+print(('Warning: regeneration unimplemented for action %r '
+'flag %r'% (action, opt)), file=sys.stderr)
 
 returnflags
 
@@ -475,7 +476,7 @@ def gyp_main(args):
 ifhome_dot_gyp!=None:
 default_include=os.path.join(home_dot_gyp, 'include.gypi')
 ifos.path.exists(default_include):
-print'Using overrides found in '+default_include
+print('Using overrides found in '+default_include)
 includes.append(default_include)
 
 # Command-line --include files come after the default include.
@@ -536,7 +537,7 @@ def gyp_main(args):
 defmain(args):
 try:
 returngyp_main(args)
-exceptGypError,e:
+exceptGypErrorase:
 sys.stderr.write("gyp: %s\n"%e)
 return1
 

gyp/pylib/gyp/common.py

@@ -363,7 +363,7 @@ def close(self):
 same=False
 try:
 same=filecmp.cmp(self.tmp_path, filename, False)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno!=errno.ENOENT:
 raise
 
@@ -382,9 +382,9 @@ def close(self):
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
-umask=os.umask(077)
+umask=os.umask(0o77)
 os.umask(umask)
-os.chmod(self.tmp_path, 0666&~umask)
+os.chmod(self.tmp_path, 0o666&~umask)
 ifsys.platform=='win32'andos.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
@@ -464,7 +464,7 @@ def CopyTool(flavor, out_path):
 ''.join([source[0], '# Generated by gyp. Do not edit.\n'] +source[1:]))
 
 # Make file executable.
-os.chmod(tool_path, 0755)
+os.chmod(tool_path, 0o755)
 
 
 # From Alex Martelli,

gyp/pylib/gyp/easy_xml.py

@@ -5,6 +5,7 @@
 importre
 importos
 importlocale
+fromfunctoolsimportreduce
 
 
 defXmlToString(content, encoding='utf-8', pretty=False):

gyp/pylib/gyp/flock_tool.py

@@ -39,7 +39,7 @@ def ExecFlock(self, lockfile, *cmd_list):
 # where fcntl.flock(fd, LOCK_EX) always fails
 # with EBADF, that's why we use this F_SETLK
 # hack instead.
-fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0666)
+fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
 ifsys.platform.startswith('aix'):
 # Python on AIX is compiled with LARGEFILE support, which changes the
 # struct size.

gyp/pylib/gyp/MSVSSettings.py

@@ -13,6 +13,7 @@
 The MSBuild schemas were also considered. They are typically found in the
 MSBuild install directory, e.g. c:\Program Files (x86)\MSBuild
 """
+from __future__ importprint_function
 
 importsys
 importre
@@ -400,7 +401,7 @@ def _ValidateExclusionSetting(setting, settings, error_msg, stderr=sys.stderr):
 
 ifunrecognized:
 # We don't know this setting. Give a warning.
-print>>stderr, error_msg
+print(error_msg, file=stderr)
 
 
 defFixVCMacroSlashes(s):
@@ -461,9 +462,9 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
 # Invoke the translation function.
 try:
 msvs_tool[msvs_setting](msvs_value, msbuild_settings)
-exceptValueError,e:
-print>>stderr, ('Warning: while converting %s/%s to MSBuild, '
-'%s'% (msvs_tool_name, msvs_setting, e))
+exceptValueErrorase:
+print(('Warning: while converting %s/%s to MSBuild, '
+'%s'% (msvs_tool_name, msvs_setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(msvs_setting,
 msvs_tool,
@@ -472,8 +473,8 @@ def ConvertToMSBuildSettings(msvs_settings, stderr=sys.stderr):
  (msvs_tool_name, msvs_setting)),
 stderr)
 else:
-print>>stderr, ('Warning: unrecognized tool %s while converting to '
-'MSBuild.'%msvs_tool_name)
+print(('Warning: unrecognized tool %s while converting to '
+'MSBuild.'%msvs_tool_name), file=stderr)
 returnmsbuild_settings
 
 
@@ -517,9 +518,9 @@ def _ValidateSettings(validators, settings, stderr):
 ifsettingintool_validators:
 try:
 tool_validators[setting](value)
-exceptValueError,e:
-print>>stderr, ('Warning: for %s/%s, %s'%
- (tool_name, setting, e))
+exceptValueErrorase:
+print(('Warning: for %s/%s, %s'%
+ (tool_name, setting, e)), file=stderr)
 else:
 _ValidateExclusionSetting(setting,
 tool_validators,
@@ -528,7 +529,7 @@ def _ValidateSettings(validators, settings, stderr):
 stderr)
 
 else:
-print>>stderr, ('Warning: unrecognized tool %s'%tool_name)
+print(('Warning: unrecognized tool %s'%tool_name), file=stderr)
 
 
 # MSVS and MBuild names of the tools.

gyp/pylib/gyp/MSVSVersion.py

@@ -158,7 +158,7 @@ def _RegistryQuery(key, value=None):
 text=None
 try:
 text=_RegistryQueryBase('Sysnative', key, value)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno==errno.ENOENT:
 text=_RegistryQueryBase('System32', key, value)
 else:

gyp/pylib/gyp/__init__.py

@@ -4,6 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ importprint_function
 importcopy
 importgyp.input
 importoptparse
@@ -34,8 +35,8 @@ def DebugOutput(mode, message, *args):
 pass
 ifargs:
 message%=args
-print'%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
-ctx[1], ctx[2], message)
+print('%s:%s:%d:%s %s'% (mode.upper(), os.path.basename(ctx[0]),
+ctx[1], ctx[2], message))
 
 defFindBuildFiles():
 extension='.gyp'
@@ -226,12 +227,12 @@ def Noop(value):
  (action=='store_false'andnotvalue)):
 flags.append(opt)
 elifoptions.use_environmentandenv_name:
-print>>sys.stderr, ('Warning: environment regeneration unimplemented '
+print(('Warning: environment regeneration unimplemented '
 'for %s flag %r env_name %r'% (action, opt,
-env_name))
+env_name)), file=sys.stderr)
 else:
-print>>sys.stderr, ('Warning: regeneration unimplemented for action %r '
-'flag %r'% (action, opt))
+print(('Warning: regeneration unimplemented for action %r '
+'flag %r'% (action, opt)), file=sys.stderr)
 
 returnflags
 
@@ -475,7 +476,7 @@ def gyp_main(args):
 ifhome_dot_gyp!=None:
 default_include=os.path.join(home_dot_gyp, 'include.gypi')
 ifos.path.exists(default_include):
-print'Using overrides found in '+default_include
+print('Using overrides found in '+default_include)
 includes.append(default_include)
 
 # Command-line --include files come after the default include.
@@ -536,7 +537,7 @@ def gyp_main(args):
 defmain(args):
 try:
 returngyp_main(args)
-exceptGypError,e:
+exceptGypErrorase:
 sys.stderr.write("gyp: %s\n"%e)
 return1
 

gyp/pylib/gyp/common.py

@@ -363,7 +363,7 @@ def close(self):
 same=False
 try:
 same=filecmp.cmp(self.tmp_path, filename, False)
-exceptOSError,e:
+exceptOSErrorase:
 ife.errno!=errno.ENOENT:
 raise
 
@@ -382,9 +382,9 @@ def close(self):
 #
 # No way to get the umask without setting a new one? Set a safe one
 # and then set it back to the old value.
-umask=os.umask(077)
+umask=os.umask(0o77)
 os.umask(umask)
-os.chmod(self.tmp_path, 0666&~umask)
+os.chmod(self.tmp_path, 0o666&~umask)
 ifsys.platform=='win32'andos.path.exists(filename):
 # NOTE: on windows (but not cygwin) rename will not replace an
 # existing file, so it must be preceded with a remove. Sadly there
@@ -464,7 +464,7 @@ def CopyTool(flavor, out_path):
 ''.join([source[0], '# Generated by gyp. Do not edit.\n'] +source[1:]))
 
 # Make file executable.
-os.chmod(tool_path, 0755)
+os.chmod(tool_path, 0o755)
 
 
 # From Alex Martelli,

gyp/pylib/gyp/easy_xml.py

@@ -5,6 +5,7 @@
 importre
 importos
 importlocale
+fromfunctoolsimportreduce
 
 
 defXmlToString(content, encoding='utf-8', pretty=False):

gyp/pylib/gyp/flock_tool.py

@@ -39,7 +39,7 @@ def ExecFlock(self, lockfile, *cmd_list):
 # where fcntl.flock(fd, LOCK_EX) always fails
 # with EBADF, that's why we use this F_SETLK
 # hack instead.
-fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0666)
+fd=os.open(lockfile, os.O_WRONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
 ifsys.platform.startswith('aix'):
 # Python on AIX is compiled with LARGEFILE support, which changes the
 # struct size.