mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Raise our own SubprocessError rather than a RuntimeError in when dealing with

Browse source 
odd rare errors coming from the subprocess module.
This commit is contained in:
Gregory P. Smith 2012-11-10 23:53:47 -08:00
parent 82fdadeba1
commit 8d07c264e4
4 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/subprocess.py
View file

@ -1042,9 +1042,9 @@ class Popen(object):
w9xpopen = os.path.join(os.path.dirname(sys.base_exec_prefix),
"w9xpopen.exe")
if not os.path.exists(w9xpopen):
raise RuntimeError("Cannot locate w9xpopen.exe, which is "
"needed for Popen to work with your "
"shell or platform.")
raise SubprocessError(
"Cannot locate w9xpopen.exe, which is needed for "
"Popen to work with your shell or platform.")
return w9xpopen
@ -1414,12 +1414,12 @@ class Popen(object):
except ValueError:
warnings.warn(RuntimeWarning(
'Bad exception data: %r' % errpipe_data))
exception_name = b'RuntimeError'
exception_name = b'SubprocessError'
hex_errno = b'0'
err_msg = b'Unknown'
child_exception_type = getattr(
builtins, exception_name.decode('ascii'),
RuntimeError)
SubprocessError)
for fd in (p2cwrite, c2pread, errread):
if fd != -1:
os.close(fd)
@ -1452,7 +1452,7 @@ class Popen(object):
self.returncode = _WEXITSTATUS(sts)
else:
# Should never happen
raise RuntimeError("Unknown child exit status!")
raise SubprocessError("Unknown child exit status!")
def _internal_poll(self, _deadstate=None, _waitpid=os.waitpid,