From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 8 Jun 2019 15:24:10 +0000 (-0700)
Subject: bpo-34886: Fix subprocess.run handling of exclusive arguments (GH-11727)
X-Git-Tag: v3.7.4rc1~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10b4fd98142edef6ab7b034e10ae5c9551043999;p=thirdparty%2FPython%2Fcpython.git

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


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.
(cherry picked from commit 8cc605acdda5aff250ab4c9b524a7560f90ca9f3)

Co-authored-by: Rémi Lapeyre <remi.lapeyre@henki.fr>
---

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 3c1abb74c26d..53a5e7209974 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -458,12 +458,12 @@ def run(*popenargs,
     The other arguments are the same as for the Popen constructor.
     """
     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.')
         kwargs['stdin'] = PIPE
 
     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 '
                              'with capture_output.')
         kwargs['stdout'] = PIPE
diff --git a/Misc/NEWS.d/next/Library/2019-06-08-16-03-19.bpo-34886.Ov-pc9.rst b/Misc/NEWS.d/next/Library/2019-06-08-16-03-19.bpo-34886.Ov-pc9.rst
new file mode 100644
index 000000000000..1b5fc3702521
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-08-16-03-19.bpo-34886.Ov-pc9.rst
@@ -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.