mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 19:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-41207 In distutils.spawn, rewrite FileNotFound (GH-21359)

Browse source 
Automerge-Triggered-By: @jaraco
This commit is contained in:
Jason R. Coombs 2020-07-07 07:11:28 -04:00 • committed by GitHub
parent 782f44b8fb
commit 6ae2780be0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/distutils/spawn.py
View file

@ -71,9 +71,15 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0):
env = dict(os.environ, env = dict(os.environ,
MACOSX_DEPLOYMENT_TARGET=cur_target) MACOSX_DEPLOYMENT_TARGET=cur_target)
proc = subprocess.Popen(cmd, env=env) try:
proc.wait() proc = subprocess.Popen(cmd, env=env)
exitcode = proc.returncode proc.wait()
exitcode = proc.returncode
except OSError as exc:
if not DEBUG:
cmd = cmd[0]
raise DistutilsExecError(
"command %r failed: %s" % (cmd, exc.args[-1])) from exc
if exitcode: if exitcode:
if not DEBUG: if not DEBUG:

5
Lib/distutils/tests/test_spawn.py
View file

@ -124,6 +124,11 @@ class SpawnTestCase(support.TempdirManager,
rv = find_executable(program) rv = find_executable(program)
self.assertEqual(rv, filename) self.assertEqual(rv, filename)
def test_spawn_missing_exe(self):
with self.assertRaises(DistutilsExecError) as ctx:
spawn(['does-not-exist'])
self.assertIn("command 'does-not-exist' failed", str(ctx.exception))
def test_suite(): def test_suite():
return unittest.makeSuite(SpawnTestCase) return unittest.makeSuite(SpawnTestCase)

1
Misc/NEWS.d/next/Library/2020-07-06-16-58-53.bpo-41207.Emw7Nk.rst Normal file
View file

@ -0,0 +1 @@
In distutils.spawn, restore expectation that DistutilsExecError is raised when the command is not found.