diff -Naur node-v11.15.0-orig/common.gypi node-v11.15.0/common.gypi --- node-v11.15.0-orig/common.gypi 2019-04-30 20:31:12.000000000 +0300 +++ node-v11.15.0/common.gypi 2019-06-27 13:09:51.857895300 +0300 @@ -11,7 +11,7 @@ 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way 'enable_pgo_generate%': '0', 'enable_pgo_use%': '0', - 'python%': 'python', + 'python%': 'python2', 'node_shared%': 'false', 'force_dynamic_crt%': 0, diff -Naur node-v11.15.0-orig/configure node-v11.15.0/configure --- node-v11.15.0-orig/configure 2019-04-30 20:31:12.000000000 +0300 +++ node-v11.15.0/configure 2019-06-27 13:09:51.882895300 +0300 @@ -6,7 +6,7 @@ _=[ 'exec' '/bin/sh' '-c' ''' which python2.7 >/dev/null && exec python2.7 "$0" "$@" which python2 >/dev/null && exec python2 "$0" "$@" -exec python "$0" "$@" +exec python2 "$0" "$@" ''' "$0" "$@" ] del _ diff -Naur node-v11.15.0-orig/configure.py node-v11.15.0/configure.py --- node-v11.15.0-orig/configure.py 2019-04-30 20:31:12.000000000 +0300 +++ node-v11.15.0/configure.py 2019-06-27 13:09:51.902895400 +0300 @@ -1570,7 +1570,7 @@ # sys.executable. This directory will be prefixed to the PATH, so that # other tools that shell out to `python` will use the appropriate python - which_python = which('python') + which_python = which('python2') if (which_python and os.path.realpath(which_python) == os.path.realpath(sys.executable)): return @@ -1581,7 +1581,7 @@ except OSError as e: if e.errno != errno.EEXIST: raise e - python_link = os.path.join(bin_override, 'python') + python_link = os.path.join(bin_override, 'python2') try: os.unlink(python_link) except OSError as e: @@ -1701,6 +1701,6 @@ if warn.warned and not options.verbose: warn('warnings were emitted in the configure phase') -print_verbose("running: \n " + " ".join(['python', 'tools/gyp_node.py'] + gyp_args)) +print_verbose("running: \n " + " ".join(['python2', 'tools/gyp_node.py'] + gyp_args)) run_gyp(gyp_args) info('configure completed successfully') diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/gyp node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/gyp --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/gyp 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/gyp 2019-06-27 13:11:28.559030700 +0300 @@ -5,4 +5,4 @@ set -e base=$(dirname "$0") -exec python "${base}/gyp_main.py" "$@" +exec python2 "${base}/gyp_main.py" "$@" diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/gyp_main.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/gyp_main.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/gyp_main.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/gyp_main.py 2019-06-27 13:11:28.614030800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/__init__.py 2019-06-27 13:11:29.754032400 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/common_test.py 2019-06-27 13:11:28.744031000 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/easy_xml_test.py 2019-06-27 13:11:28.804031100 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/flock_tool.py 2019-06-27 13:11:28.829031100 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 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. diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/msvs_test.py 2019-06-27 13:11:29.089031500 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # 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. diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja.py 2019-06-27 13:11:29.114031500 +0300 @@ -1754,7 +1754,7 @@ return '%(python)s gyp-win-tool link-with-manifests $arch %(embed)s ' \ '%(out)s "%(ldcmd)s" %(resname)s $mt $rc "$intermediatemanifest" ' \ '$manifests' % { - 'python': sys.executable, + 'python2': sys.executable, 'out': out, 'ldcmd': ldcmd, 'resname': resource_name, diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/ninja_test.py 2019-06-27 13:11:29.134031500 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode.py 2019-06-27 13:11:29.159031600 +0300 @@ -283,7 +283,7 @@ command_prefix = '' if serialize_all_tests: command_prefix = \ -"""python -c "import fcntl, subprocess, sys +"""python2 -c "import fcntl, subprocess, sys file = open('$TMPDIR/GYP_serialize_test_runs', 'a') fcntl.flock(file.fileno(), fcntl.LOCK_EX) sys.exit(subprocess.call(sys.argv[1:]))" """ diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/xcode_test.py 2019-06-27 13:11:29.184031600 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2013 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input_test.py 2019-06-27 13:11:29.264031700 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2013 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/mac_tool.py 2019-06-27 13:11:29.289031800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # 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. diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py 2019-06-27 13:11:29.394031900 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/win_tool.py 2019-06-27 13:11:29.619032200 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be @@ -144,7 +144,7 @@ # first and only link. We still tell link to generate a manifest, but we # only use that to assert that our simpler process did not miss anything. variables = { - 'python': sys.executable, + 'python2': sys.executable, 'arch': arch, 'out': out, 'ldcmd': ldcmd, diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/samples/samples node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/samples/samples --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/samples/samples 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/samples/samples 2019-06-27 13:11:29.784032400 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/setup.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/setup.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/setup.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/setup.py 2019-06-27 13:11:29.844032500 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2009 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-06-27 13:11:29.974032700 +0300 @@ -987,7 +987,7 @@ '<(SHARED_INTERMEDIATE_DIR)/media/jni/media_player_listener_jni.h', ], 'action': [ - 'python', + 'python2', '<(DEPTH)/base/android/jni_generator/jni_generator.py', '-o', '<@(_inputs)', diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp.fontified node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp.fontified --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp.fontified 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp.fontified 2019-06-27 13:11:29.999032700 +0300 @@ -988,7 +988,7 @@ '<(SHARED_INTERMEDIATE_DIR)/media/jni/media_player_listener_jni.h', ], 'action': [ - 'python', + 'python2', '<(DEPTH)/base/android/jni_generator/jni_generator.py', '-o', '<@(_inputs)', diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/graphviz.py 2019-06-27 13:11:30.024032800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2011 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_gyp.py 2019-06-27 13:11:30.054032800 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_sln.py 2019-06-27 13:11:30.074032900 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/gyp/tools/pretty_vcproj.py 2019-06-27 13:11:30.104032900 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright (c) 2012 Google Inc. All rights reserved. # Use of this source code is governed by a BSD-style license that can be diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/lib/configure.js node-v11.15.0/deps/npm/node_modules/node-gyp/lib/configure.js --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/lib/configure.js 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/lib/configure.js 2019-06-27 13:11:30.284033100 +0300 @@ -47,7 +47,7 @@ function getNodeDir () { - // 'python' should be set by now + // 'python2' should be set by now process.env.PYTHON = python if (gyp.opts.nodedir) { @@ -397,7 +397,7 @@ if (err) { this.log.verbose('`which` failed', this.python, err) if (this.python === 'python2') { - this.python = 'python' + this.python = 'python2' return this.checkPython() } if (this.win) { diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/README.md node-v11.15.0/deps/npm/node_modules/node-gyp/README.md --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/README.md 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/README.md 2019-06-27 13:11:31.969035500 +0300 @@ -70,7 +70,7 @@ ``` If `node-gyp` is called by way of `npm` *and* you have multiple versions of -Python installed, then you can set `npm`'s 'python' config key to the appropriate +Python installed, then you can set `npm`'s 'python2' config key to the appropriate value: ``` bash diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/test/test-addon.js node-v11.15.0/deps/npm/node_modules/node-gyp/test/test-addon.js --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/test/test-addon.js 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/test/test-addon.js 2019-06-27 13:11:32.224035900 +0300 @@ -16,13 +16,13 @@ function getEncoding() { var code = 'import locale;print locale.getdefaultlocale()[1]' - return execFileSync('python', ['-c', code]).toString().trim() + return execFileSync('python2', ['-c', code]).toString().trim() } function checkCharmapValid() { var data try { - data = execFileSync('python', ['fixtures/test-charmap.py'], + data = execFileSync('python2', ['fixtures/test-charmap.py'], { cwd: __dirname }) } catch (err) { return false diff -Naur node-v11.15.0-orig/deps/npm/node_modules/node-gyp/test/test-find-python.js node-v11.15.0/deps/npm/node_modules/node-gyp/test/test-find-python.js --- node-v11.15.0-orig/deps/npm/node_modules/node-gyp/test/test-find-python.js 2019-04-30 20:31:13.000000000 +0300 +++ node-v11.15.0/deps/npm/node_modules/node-gyp/test/test-find-python.js 2019-06-27 13:11:32.364036100 +0300 @@ -9,7 +9,7 @@ test('find python', function (t) { t.plan(4) - configure.test.findPython('python', function (err, found) { + configure.test.findPython('python2', function (err, found) { t.strictEqual(err, null) var proc = execFile(found, ['-V'], function (err, stdout, stderr) { t.strictEqual(err, null) @@ -55,13 +55,13 @@ test('find python - python', function (t) { t.plan(5) - var f = new TestPythonFinder('python', done) + var f = new TestPythonFinder('python2', done) f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(null, program) } f.execFile = function(program, args, opts, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') t.ok(/import sys/.test(args[1])) cb(null, '2.7.0') } @@ -69,20 +69,20 @@ function done(err, python) { t.strictEqual(err, null) - t.strictEqual(python, 'python') + t.strictEqual(python, 'python2') } }) test('find python - python too old', function (t) { t.plan(4) - var f = new TestPythonFinder('python', done) + var f = new TestPythonFinder('python2', done) f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(null, program) } f.execFile = function(program, args, opts, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') t.ok(/import sys/.test(args[1])) cb(null, '2.3.4') } @@ -96,13 +96,13 @@ test('find python - python too new', function (t) { t.plan(4) - var f = new TestPythonFinder('python', done) + var f = new TestPythonFinder('python2', done) f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(null, program) } f.execFile = function(program, args, opts, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') t.ok(/import sys/.test(args[1])) cb(null, '3.0.0') } @@ -116,9 +116,9 @@ test('find python - no python', function (t) { t.plan(2) - var f = new TestPythonFinder('python', done) + var f = new TestPythonFinder('python2', done) f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(new Error('not found')) } f.checkPython() @@ -134,14 +134,14 @@ var f = new TestPythonFinder('python2', done) f.which = function(program, cb) { f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(null, program) } t.strictEqual(program, 'python2') cb(new Error('not found')) } f.execFile = function(program, args, opts, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') t.ok(/import sys/.test(args[1])) cb(null, '2.7.0') } @@ -149,7 +149,7 @@ function done(err, python) { t.strictEqual(err, null) - t.strictEqual(python, 'python') + t.strictEqual(python, 'python2') } }) @@ -162,7 +162,7 @@ f.which = function(program, cb) { f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(new Error('not found')) } t.strictEqual(program, 'python2') @@ -178,12 +178,12 @@ test('find python - no python, use python launcher', function (t) { t.plan(8) - var f = new TestPythonFinder('python', done) + var f = new TestPythonFinder('python2', done) f.env = {} f.win = true f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(new Error('not found')) } f.execFile = function(program, args, opts, cb) { @@ -208,12 +208,12 @@ test('find python - python 3, use python launcher', function (t) { t.plan(10) - var f = new TestPythonFinder('python', done) + var f = new TestPythonFinder('python2', done) f.env = {} f.win = true f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(null, program) } f.execFile = function(program, args, opts, cb) { @@ -228,7 +228,7 @@ t.notEqual(args.indexOf('-c'), -1) cb(null, 'Z:\\snake.exe') } - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') t.ok(/import sys/.test(args[1])) cb(null, '3.0.0') } @@ -244,13 +244,13 @@ function (t) { t.plan(9) - var f = new TestPythonFinder('python', done) + var f = new TestPythonFinder('python2', done) f.checkedPythonLauncher = false f.env = {} f.win = true f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(null, program) } f.execFile = function(program, args, opts, cb) { @@ -265,7 +265,7 @@ t.notEqual(args.indexOf('-c'), -1) cb(null, 'Z:\\snake.exe') } - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') t.ok(/import sys/.test(args[1])) cb(null, '3.0.0') } @@ -280,12 +280,12 @@ t.plan(6) var re = /C:[\\\/]Python27[\\\/]python[.]exe/ - var f = new TestPythonFinder('python', done) + var f = new TestPythonFinder('python2', done) f.env = {} f.win = true f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(new Error('not found')) } f.execFile = function(program, args, opts, cb) { @@ -312,12 +312,12 @@ test('find python - no python, no python launcher, bad guess', function (t) { t.plan(4) - var f = new TestPythonFinder('python', done) + var f = new TestPythonFinder('python2', done) f.env = { SystemDrive: 'Z:\\' } f.win = true f.which = function(program, cb) { - t.strictEqual(program, 'python') + t.strictEqual(program, 'python2') cb(new Error('not found')) } f.execFile = function(program, args, opts, cb) { diff -Naur node-v11.15.0-orig/deps/openssl/openssl/fuzz/helper.py node-v11.15.0/deps/openssl/openssl/fuzz/helper.py --- node-v11.15.0-orig/deps/openssl/openssl/fuzz/helper.py 2019-04-30 20:31:26.000000000 +0300 +++ node-v11.15.0/deps/openssl/openssl/fuzz/helper.py 2019-06-27 13:13:35.496208600 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # # Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. # diff -Naur node-v11.15.0-orig/deps/uv/gyp_uv.py node-v11.15.0/deps/uv/gyp_uv.py --- node-v11.15.0-orig/deps/uv/gyp_uv.py 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/uv/gyp_uv.py 2019-06-27 13:13:43.351219600 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import os import platform diff -Naur node-v11.15.0-orig/deps/uv/tools/make_dist_html.py node-v11.15.0/deps/uv/tools/make_dist_html.py --- node-v11.15.0-orig/deps/uv/tools/make_dist_html.py 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/uv/tools/make_dist_html.py 2019-06-27 13:13:46.876224500 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 from __future__ import print_function diff -Naur node-v11.15.0-orig/deps/v8/DEPS node-v11.15.0/deps/v8/DEPS --- node-v11.15.0-orig/deps/v8/DEPS 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/v8/DEPS 2019-06-27 13:13:48.121226200 +0300 @@ -107,7 +107,7 @@ 'name': 'disable_depot_tools_selfupdate', 'pattern': '.', 'action': [ - 'python', + 'python2', 'v8/third_party/depot_tools/update_depot_tools_toggle.py', '--disable', ], @@ -119,7 +119,7 @@ 'name': 'landmines', 'pattern': '.', 'action': [ - 'python', + 'python2', 'v8/build/landmines.py', '--landmine-scripts', 'v8/tools/get_landmines.py', @@ -284,35 +284,35 @@ 'name': 'sysroot_arm', 'pattern': '.', 'condition': '(checkout_linux and checkout_arm)', - 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', '--arch=arm'], }, { 'name': 'sysroot_arm64', 'pattern': '.', 'condition': '(checkout_linux and checkout_arm64)', - 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', '--arch=arm64'], }, { 'name': 'sysroot_x86', 'pattern': '.', 'condition': '(checkout_linux and (checkout_x86 or checkout_x64))', - 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', '--arch=x86'], }, { 'name': 'sysroot_mips', 'pattern': '.', 'condition': '(checkout_linux and checkout_mips)', - 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', '--arch=mips'], }, { 'name': 'sysroot_x64', 'pattern': '.', 'condition': 'checkout_linux and checkout_x64', - 'action': ['python', 'v8/build/linux/sysroot_scripts/install-sysroot.py', + 'action': ['python2', 'v8/build/linux/sysroot_scripts/install-sysroot.py', '--arch=x64'], }, { @@ -342,14 +342,14 @@ 'name': 'win_toolchain', 'pattern': '.', 'condition': 'checkout_win', - 'action': ['python', 'v8/build/vs_toolchain.py', 'update'], + 'action': ['python2', 'v8/build/vs_toolchain.py', 'update'], }, { # Update the Mac toolchain if necessary. 'name': 'mac_toolchain', 'pattern': '.', 'condition': 'checkout_mac', - 'action': ['python', 'v8/build/mac_toolchain.py'], + 'action': ['python2', 'v8/build/mac_toolchain.py'], }, # Pull binutils for linux, enabled debug fission for faster linking / # debugging when used with clang on Ubuntu Precise. @@ -359,7 +359,7 @@ 'pattern': 'v8/third_party/binutils', 'condition': 'host_os == "linux"', 'action': [ - 'python', + 'python2', 'v8/third_party/binutils/download.py', ], }, @@ -369,13 +369,13 @@ 'pattern': '.', # clang not supported on aix 'condition': 'host_os != "aix"', - 'action': ['python', 'v8/tools/clang/scripts/update.py'], + 'action': ['python2', 'v8/tools/clang/scripts/update.py'], }, { # Update LASTCHANGE. 'name': 'lastchange', 'pattern': '.', - 'action': ['python', 'v8/build/util/lastchange.py', + 'action': ['python2', 'v8/build/util/lastchange.py', '-o', 'v8/build/util/LASTCHANGE'], }, { @@ -383,7 +383,7 @@ 'pattern': '.', 'condition': 'checkout_fuchsia', 'action': [ - 'python', + 'python2', 'v8/build/fuchsia/update_sdk.py', ], }, @@ -415,7 +415,7 @@ 'pattern': '.', 'condition': 'check_v8_header_includes', 'action': [ - 'python', + 'python2', 'v8/tools/generate-header-include-checks.py', ], }, diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/cctest.gyp node-v11.15.0/deps/v8/gypfiles/cctest.gyp --- node-v11.15.0-orig/deps/v8/gypfiles/cctest.gyp 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/v8/gypfiles/cctest.gyp 2019-06-27 13:13:48.231226400 +0300 @@ -438,7 +438,7 @@ '<(generated_file)', ], 'action': [ - 'python', + 'python2', '../tools/js2c.py', '<@(_outputs)', 'TEST', # type diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/coverage_wrapper.py node-v11.15.0/deps/v8/gypfiles/coverage_wrapper.py --- node-v11.15.0-orig/deps/v8/gypfiles/coverage_wrapper.py 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/v8/gypfiles/coverage_wrapper.py 2019-06-27 13:13:48.261226400 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2016 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/d8.gyp node-v11.15.0/deps/v8/gypfiles/d8.gyp --- node-v11.15.0-orig/deps/v8/gypfiles/d8.gyp 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/v8/gypfiles/d8.gyp 2019-06-27 13:13:48.286226500 +0300 @@ -109,7 +109,7 @@ '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', ], 'action': [ - 'python', + 'python2', '../tools/js2c.py', '<@(_outputs)', 'D8', diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/gyp_v8 node-v11.15.0/deps/v8/gypfiles/gyp_v8 --- node-v11.15.0-orig/deps/v8/gypfiles/gyp_v8 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/v8/gypfiles/gyp_v8 2019-06-27 13:13:48.456226700 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # Copyright 2012 the V8 project authors. All rights reserved. # Redistribution and use in source and binary forms, with or without diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/inspector.gypi node-v11.15.0/deps/v8/gypfiles/inspector.gypi --- node-v11.15.0-orig/deps/v8/gypfiles/inspector.gypi 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/v8/gypfiles/inspector.gypi 2019-06-27 13:13:48.536226800 +0300 @@ -101,7 +101,7 @@ '<@(SHARED_INTERMEDIATE_DIR)/src/js_protocol.stamp', ], 'action': [ - 'python', + 'python2', '<(protocol_path)/CheckProtocolCompatibility.py', '--stamp', '<@(_outputs)', '<(inspector_path)/js_protocol.json', @@ -120,7 +120,7 @@ ], 'process_outputs_as_sources': 1, 'action': [ - 'python', + 'python2', '<(protocol_path)/CodeGenerator.py', '--jinja_dir', '../third_party', '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/inspector', @@ -139,7 +139,7 @@ ], 'process_outputs_as_sources': 1, 'action': [ - 'python', + 'python2', '<(inspector_path)/build/xxd.py', 'InjectedScriptSource_js', '<(inspector_path)/injected-script-source.js', diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/run-tests-legacy.py node-v11.15.0/deps/v8/gypfiles/run-tests-legacy.py --- node-v11.15.0-orig/deps/v8/gypfiles/run-tests-legacy.py 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/v8/gypfiles/run-tests-legacy.py 2019-06-27 13:13:48.696227000 +0300 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Copyright 2017 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff -Naur node-v11.15.0-orig/deps/v8/gypfiles/shim_headers.gypi node-v11.15.0/deps/v8/gypfiles/shim_headers.gypi --- node-v11.15.0-orig/deps/v8/gypfiles/shim_headers.gypi 2019-04-30 20:31:27.000000000 +0300 +++ node-v11.15.0/deps/v8/gypfiles/shim_headers.gypi 2019-06-27 13:13:48.781227200 +0300 @@ -62,7 +62,7 @@ 'outputs': [ '