Python 3 compatibility

pylib/gyp/common.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from __future__ import with_statement
 
 import collections
 import errno
 import filecmp
 import os.path
@@ skipping 327 matching lines @@
 
   class Writer(object):
     """Wrapper around file which only covers the target if it differs."""
     def __init__(self):
       # Pick temporary file.
       tmp_fd, self.tmp_path = tempfile.mkstemp(
           suffix='.tmp',
           prefix=os.path.split(filename)[1] + '.gyp.',
           dir=os.path.split(filename)[0])
       try:
-        self.tmp_file = os.fdopen(tmp_fd, 'wb')
+        self.tmp_file = os.fdopen(tmp_fd, 'w')

[Nico, 2016/07/29 22:22:06]

doesn't this change behavior on windows?

[AWhetter, 2016/11/05 23:59:49]

Yes but we only ever write text so I think we should be doing this anyway?

       except Exception:
         # Don't leave turds behind.
         os.unlink(self.tmp_path)
         raise
 
     def __getattr__(self, attrname):
       # Delegate everything else to self.tmp_file
       return getattr(self.tmp_file, attrname)
 
     def close(self):
       try:
         # Close tmp file.
         self.tmp_file.close()
         # Determine if different.
         same = False
         try:
           same = filecmp.cmp(self.tmp_path, filename, False)
-        except OSError, e:
+        except OSError as e:
           if e.errno != errno.ENOENT:
             raise
 
         if same:
           # The new file is identical to the old one, just get rid of the new
           # one.
           os.unlink(self.tmp_path)
         else:
           # The new file is different from the old one, or there is no old one.
           # Rename the new file to the permanent name.
           #
           # tempfile.mkstemp uses an overly restrictive mode, resulting in a
           # file that can only be read by the owner, regardless of the umask.
           # There's no reason to not respect the umask here, which means that
           # an extra hoop is required to fetch it and reset the new file's mode.
           #
           # 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)
           if sys.platform == 'win32' and os.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
             # is no way to make the switch atomic.
             os.remove(filename)
           os.rename(self.tmp_path, filename)
       except Exception:
         # Don't leave turds behind.
         os.unlink(self.tmp_path)
         raise
@@ skipping 62 matching lines @@
     header += "import os;\nos.environ['DEVELOPER_DIR']='%s'\n" \
         % mac_toolchain_dir
 
   # Add header and write it out.
   tool_path = os.path.join(out_path, 'gyp-%s-tool' % prefix)
   with open(tool_path, 'w') as tool_file:
     tool_file.write(
         ''.join([source[0], header] + source[1:]))
 
   # Make file executable.
-  os.chmod(tool_path, 0755)
+  os.chmod(tool_path, 0o755)
 
 
 # From Alex Martelli,
 # http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52560
 # ASPN: Python Cookbook: Remove duplicates from a sequence
 # First comment, dated 2001/10/13.
 # (Also in the printed Python Cookbook.)
 
 def uniquer(seq, idfun=None):
     if idfun is None:
@@ skipping 125 matching lines @@
 def CrossCompileRequested():
   # TODO: figure out how to not build extra host objects in the
   # non-cross-compile case when this is enabled, and enable unconditionally.
   return (os.environ.get('GYP_CROSSCOMPILE') or
           os.environ.get('AR_host') or
           os.environ.get('CC_host') or
           os.environ.get('CXX_host') or
           os.environ.get('AR_target') or
           os.environ.get('CC_target') or
           os.environ.get('CXX_target'))