mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

bpo-34886: Fix subprocess.run handling of exclusive arguments (GH-11727)

Browse source 
Fix an unintended ValueError from :func:`subprocess.run` when checking for
conflicting `input` and `stdin` or `capture_output` and `stdout` or `stderr` args
when they were explicitly provided but with `None` values within a passed in
`**kwargs` dict rather than as passed directly by name.
This commit is contained in:
Rémi Lapeyre 2019-06-08 16:56:24 +02:00 • committed by Gregory P. Smith
parent a15a7bcaea
commit 8cc605acdd
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/subprocess.py
View file

@ -459,12 +459,12 @@ def run(*popenargs,
The other arguments are the same as for the Popen constructor. The other arguments are the same as for the Popen constructor.
""" """
if input is not None: if input is not None:
if 'stdin' in kwargs: if kwargs.get('stdin') is not None:
raise ValueError('stdin and input arguments may not both be used.') raise ValueError('stdin and input arguments may not both be used.')
kwargs['stdin'] = PIPE kwargs['stdin'] = PIPE
if capture_output: if capture_output:
if ('stdout' in kwargs) or ('stderr' in kwargs): if kwargs.get('stdout') is not None or kwargs.get('stderr') is not None:
raise ValueError('stdout and stderr arguments may not be used ' raise ValueError('stdout and stderr arguments may not be used '
'with capture_output.') 'with capture_output.')
kwargs['stdout'] = PIPE kwargs['stdout'] = PIPE

5
Misc/NEWS.d/next/Library/2019-06-08-16-03-19.bpo-34886.Ov-pc9.rst Normal file
View file

@ -0,0 +1,5 @@
Fix an unintended ValueError from :func:`subprocess.run` when checking for
conflicting `input` and `stdin` or `capture_output` and `stdout` or `stderr`
args when they were explicitly provided but with `None` values within a
passed in `**kwargs` dict rather than as passed directly by name. Patch
contributed by Rémi Lapeyre.