Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: remove Python 2 workaround #41357

Merged
merged 1 commit into from
Jan 1, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
import bz2
import io

# Fallback to find_executable from distutils.spawn is a stopgap for
# supporting V8 builds, which do not yet support Python 3.
try:
from shutil import which
except ImportError:
from distutils.spawn import find_executable as which
from distutils.version import StrictVersion

# If not run from node/, cd to node/.
Expand Down Expand Up @@ -1859,7 +1853,7 @@ def make_bin_override():
# 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 = shutil.which('python')
if (which_python and
os.path.realpath(which_python) == os.path.realpath(sys.executable)):
return
Expand Down