build: enhance Python 3 compatibility

.travis.yml

@@ -7,6 +7,9 @@ x-ccache-setup-steps: &ccache-setup-steps
 os: linux
 dist: xenial
 language: cpp
+env:
+  global:
+    - PYTHON_VERSION="2.7.15"
 jobs:
   include:
     - stage: "Compile"
@@ -20,7 +23,8 @@ jobs:
             - g++-6
       install: *ccache-setup-steps
       script:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
+        - export PYTHONPATH="${PYTHONPATH}:$(pwd)/tools"
         - ./configure
         - make -j2 -C out V=1 v8
 
@@ -34,7 +38,8 @@ jobs:
             - g++-6
       install: *ccache-setup-steps
       script:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
+        - export PYTHONPATH="${PYTHONPATH}:$(pwd)/tools"
         - ./configure
         - make -j2 V=1
         - cp out/Release/node /home/travis/.ccache
@@ -47,7 +52,8 @@ jobs:
         - mkdir -p out/Release
         - cp /home/travis/.ccache/node out/Release/node
       script:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
+        - export PYTHONPATH="${PYTHONPATH}:$(pwd)/tools"
         - python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare default
 
     - name: "Test C++ Suites"
@@ -63,7 +69,8 @@ jobs:
         - cp /home/travis/.ccache/cctest out/Release/cctest
         - touch config.gypi
       script:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
+        - export PYTHONPATH="${PYTHONPATH}:$(pwd)/tools"
         - out/Release/cctest
         - make -j1 V=1 test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
         - python tools/test.py -j 2 -p dots --report --mode=release --flaky-tests=dontcare addons js-native-api node-api
@@ -72,7 +79,8 @@ jobs:
       language: node_js
       node_js: "node"
       install:
-        - pyenv global 2.7.15
+        - pyenv global ${PYTHON_VERSION}
+        - export PYTHONPATH="${PYTHONPATH}:$(pwd)/tools"
         - make lint-py-build || true
       script:
         - NODE=$(which node) make lint lint-py

LICENSE

@@ -1507,3 +1507,26 @@ The externally maintained libraries used by Node.js are:
     ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
     OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   """
+
+- six, located at tools/six.py, is licensed as follows:
+  """
+    Copyright (c) 2010-2019 Benjamin Peterson
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+  """

configure.py

@@ -11,7 +11,6 @@
 import shlex
 import subprocess
 import shutil
-import string
 from distutils.spawn import find_executable as which
 
 # If not run from node/, cd to node/.
@@ -675,8 +674,8 @@ def try_check_compiler(cc, lang):
   except OSError:
     return (False, False, '', '')
 
-  proc.stdin.write('__clang__ __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__ '
-                   '__clang_major__ __clang_minor__ __clang_patchlevel__')
+  proc.stdin.write(b'__clang__ __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__ '
+                   b'__clang_major__ __clang_minor__ __clang_patchlevel__')
 
   values = (proc.communicate()[0].split() + ['0'] * 7)[0:7]
   is_clang = values[0] == '1'
@@ -753,7 +752,7 @@ def get_gas_version(cc):
        consider adjusting the CC environment variable if you installed
        it in a non-standard prefix.''')
 
-  gas_ret = proc.communicate()[1]
+  gas_ret = str(proc.communicate()[1])
   match = re.match(r"GNU assembler version ([2-9]\.[0-9]+)", gas_ret)
 
   if match:
@@ -818,7 +817,7 @@ def cc_macros(cc=None):
        consider adjusting the CC environment variable if you installed
        it in a non-standard prefix.''')
 
-  p.stdin.write('\n')
+  p.stdin.write(b'\n')
   out = p.communicate()[0]
 
   out = str(out).split('\n')
@@ -1380,7 +1379,7 @@ def write_config(data, name):
     o['variables']['icu_small'] = b(True)
     locs = set(options.with_icu_locales.split(','))
     locs.add('root')  # must have root
-    o['variables']['icu_locales'] = string.join(locs,',')
+    o['variables']['icu_locales'] = ','.join(str(loc) for loc in locs)
     # We will check a bit later if we can use the canned deps/icu-small
   elif with_intl == 'full-icu':
     # full ICU

deps/v8/third_party/inspector_protocol/code_generator.py

@@ -62,15 +62,24 @@ def init_defaults(config_tuple, path, defaults):
         jinja_dir = arg_options.jinja_dir
         if not jinja_dir:
             raise Exception("jinja directory must be specified")
-        jinja_dir = jinja_dir.decode('utf8')
+        try:
+            jinja_dir = jinja_dir.decode('utf8')
+        except AttributeError:  # Python 3
+            pass
         output_base = arg_options.output_base
         if not output_base:
             raise Exception("Base output directory must be specified")
-        output_base = output_base.decode('utf8')
+        try:
+            output_base = output_base.decode('utf8')
+        except AttributeError:  # Python 3
+            pass
         config_file = arg_options.config
         if not config_file:
             raise Exception("Config file name must be specified")
-        config_file = config_file.decode('utf8')
+        try:
+            config_file = config_file.decode('utf8')
+        except AttributeError:  # Python 3
+            pass
         config_base = os.path.dirname(config_file)
         config_values = arg_options.config_value
         if not config_values:

deps/v8/tools/gen-postmortem-metadata.py

@@ -636,9 +636,7 @@ def emit_config():
 
         out.write('/* class type information */\n');
         consts = [];
-        keys = typeclasses.keys();
-        keys.sort();
-        for typename in keys:
+        for typename in sorted(typeclasses):
                 klass = typeclasses[typename];
                 consts.append({
                     'name': 'type_%s__%s' % (klass, typename),
@@ -649,9 +647,7 @@ def emit_config():
 
         out.write('/* class hierarchy information */\n');
         consts = [];
-        keys = klasses.keys();
-        keys.sort();
-        for klassname in keys:
+        for klassname in sorted(klasses):
                 pklass = klasses[klassname]['parent'];
                 bklass = get_base_class(klassname);
                 if (bklass != 'Object'):

tools/configure.d/nodedownload.py

@@ -2,27 +2,27 @@
 # Moved some utilities here from ../../configure
 
 from __future__ import print_function
-import urllib
 import hashlib
 import sys
 import zipfile
 import tarfile
-import fpformat
 import contextlib
+from six.moves.urllib.request import FancyURLopener, URLopener
 
 def formatSize(amt):
     """Format a size as a string in MB"""
-    return fpformat.fix(amt / 1024000., 1)
+    # return fpformat.fix(amt / 1024000., 1)
+    return "%.1f" % (amt / 1024000.)
 
 def spin(c):
     """print out an ASCII 'spinner' based on the value of counter 'c'"""
     spin = ".:|'"
     return (spin[c % len(spin)])
 
-class ConfigOpener(urllib.FancyURLopener):
+class ConfigOpener(FancyURLopener):
     """fancy opener used by retrievefile. Set a UA"""
     # append to existing version (UA)
-    version = '%s node.js/configure' % urllib.URLopener.version
+    version = '%s node.js/configure' % URLopener.version
 
 def reporthook(count, size, total):
     """internal hook used by retrievefile"""

tools/license-builder.sh

@@ -106,4 +106,6 @@ addlicense "HdrHistogram" "deps/histogram" "$(cat ${rootdir}/deps/histogram/LICE
 addlicense "node-heapdump" "src/heap_utils.cc" \
            "$(curl -sL https://raw.githubusercontent.com/bnoordhuis/node-heapdump/0ca52441e46241ffbea56a389e2856ec01c48c97/LICENSE)"
 
+addlicense "six" "tools/six.py" "$(sed -e '/^$/,$d' -e 's/^#//' -e 's/^ //' ${rootdir}/tools/six.py)"
+
 mv $tmplicense $licensefile