Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clauss <cclauss@me.com>2020-12-30 17:09:52 +0300
committerRichard Lau <rlau@redhat.com>2021-04-16 22:47:02 +0300
commit4268fae04acc16b34fb302d63b01a85725ef2043 (patch)
tree5f8eb2c274dca965ebf4129dea81f835c3c564a9 /configure
parent6d04cc684952ccbaa4a0cad36752a0f2bbaaa048 (diff)
build: remove support for Python 2
PR-URL: https://github.com/nodejs/node/pull/36691 Fixes: https://github.com/nodejs/node/issues/25789 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure16
1 files changed, 6 insertions, 10 deletions
diff --git a/configure b/configure
index ca2cd8aa9e6..dbe28730902 100755
--- a/configure
+++ b/configure
@@ -1,17 +1,14 @@
#!/bin/sh
-# Locate an acceptable python interpreter and then re-execute the script.
+# Locate an acceptable Python interpreter and then re-execute the script.
# Note that the mix of single and double quotes is intentional,
# as is the fact that the ] goes on a new line.
_=[ 'exec' '/bin/sh' '-c' '''
-test ${FORCE_PYTHON2} && exec python2 "$0" "$@" # workaround for gclient
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
-command -v python3.5 >/dev/null && exec python3.5 "$0" "$@"
command -v python3 >/dev/null && exec python3 "$0" "$@"
-command -v python2.7 >/dev/null && exec python2.7 "$0" "$@"
exec python "$0" "$@"
''' "$0" "$@"
]
@@ -20,16 +17,15 @@ del _
import sys
from distutils.spawn import find_executable
-print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
-acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
+print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info))
+acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6))
if sys.version_info[:2] in acceptable_pythons:
import configure
else:
- python_cmds = ['python{0}.{1}'.format(*vers) for vers in acceptable_pythons]
- sys.stderr.write('Please use {0}.\n'.format(' or '.join(python_cmds)))
+ python_cmds = ['python{}.{}'.format(*vers) for vers in acceptable_pythons]
+ sys.stderr.write('Please use {}.\n'.format(' or '.join(python_cmds)))
for python_cmd in python_cmds:
python_cmd_path = find_executable(python_cmd)
if python_cmd_path and 'pyenv/shims' not in python_cmd_path:
- sys.stderr.write('\t{0} {1}\n'.format(python_cmd_path,
- ' '.join(sys.argv[:1])))
+ sys.stderr.write('\t{} {}\n'.format(python_cmd_path, ' '.join(sys.argv[:1])))
sys.exit(1)