Commit 0e48f661 authored by Victor Stinner's avatar Victor Stinner Committed by GitHub

bpo-34530: Fix distutils find_executable() (GH-9049)

distutils.spawn.find_executable() now falls back on os.defpath if the
PATH environment variable is not set.
parent 8be16112
...@@ -173,7 +173,7 @@ def find_executable(executable, path=None): ...@@ -173,7 +173,7 @@ def find_executable(executable, path=None):
os.environ['PATH']. Returns the complete filename or None if not found. os.environ['PATH']. Returns the complete filename or None if not found.
""" """
if path is None: if path is None:
path = os.environ['PATH'] path = os.environ.get('PATH', os.defpath)
paths = path.split(os.pathsep) paths = path.split(os.pathsep)
base, ext = os.path.splitext(executable) base, ext = os.path.splitext(executable)
......
"""Tests for distutils.spawn.""" """Tests for distutils.spawn."""
import unittest
import sys
import os import os
import stat
import sys
import unittest
from unittest import mock
from test.support import run_unittest, unix_shell from test.support import run_unittest, unix_shell
from test import support as test_support
from distutils.spawn import find_executable
from distutils.spawn import _nt_quote_args from distutils.spawn import _nt_quote_args
from distutils.spawn import spawn from distutils.spawn import spawn
from distutils.errors import DistutilsExecError from distutils.errors import DistutilsExecError
...@@ -51,6 +55,47 @@ class SpawnTestCase(support.TempdirManager, ...@@ -51,6 +55,47 @@ class SpawnTestCase(support.TempdirManager,
os.chmod(exe, 0o777) os.chmod(exe, 0o777)
spawn([exe]) # should work without any error spawn([exe]) # should work without any error
def test_find_executable(self):
with test_support.temp_dir() as tmp_dir:
# use TESTFN to get a pseudo-unique filename
program_noeext = test_support.TESTFN
# Give the temporary program an ".exe" suffix for all.
# It's needed on Windows and not harmful on other platforms.
program = program_noeext + ".exe"
filename = os.path.join(tmp_dir, program)
with open(filename, "wb"):
pass
os.chmod(filename, stat.S_IXUSR)
# test path parameter
rv = find_executable(program, path=tmp_dir)
self.assertEqual(rv, filename)
if sys.platform == 'win32':
# test without ".exe" extension
rv = find_executable(program_noeext, path=tmp_dir)
self.assertEqual(rv, filename)
# test find in the current directory
with test_support.change_cwd(tmp_dir):
rv = find_executable(program)
self.assertEqual(rv, program)
# test non-existent program
dont_exist_program = "dontexist_" + program
rv = find_executable(dont_exist_program , path=tmp_dir)
self.assertIsNone(rv)
# test os.defpath: missing PATH environment variable
with test_support.EnvironmentVarGuard() as env:
with mock.patch('distutils.spawn.os.defpath', tmp_dir):
env.pop('PATH')
rv = find_executable(program)
self.assertEqual(rv, filename)
def test_suite(): def test_suite():
return unittest.makeSuite(SpawnTestCase) return unittest.makeSuite(SpawnTestCase)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment