[Python-checkins] [3.6] bpo-32392: Document env keyword argument of subprocess.run() (GH-7289)

[Berker Peksag]

https://github.com/python/cpython/commit/279564431e8e2fa4c20e8850420caea484a5d20b
commit: 279564431e8e2fa4c20e8850420caea484a5d20b
branch: 3.6
author: Berker Peksag <berker.peksag at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018-06-07T22:22:35+03:00
summary:

[3.6] bpo-32392: Document env keyword argument of subprocess.run() (GH-7289)

(cherry picked from commit af1ec97a6d1dde68b2dc0ee9b78965eb219061a8)

Conflicts:

	Doc/library/subprocess.rst

files:
M Doc/library/subprocess.rst

diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 6a5f276073b2..f624adbda4c8 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -39,7 +39,7 @@ compatibility with older versions, see the :ref:`call-function-trio` section.
 
 .. function:: run(args, *, stdin=None, input=None, stdout=None, stderr=None,\
                   shell=False, cwd=None, timeout=None, check=False, \
-                  encoding=None, errors=None)
+                  encoding=None, errors=None, env=None)
 
    Run the command described by *args*.  Wait for command to complete, then
    return a :class:`CompletedProcess` instance.
@@ -75,6 +75,11 @@ compatibility with older versions, see the :ref:`call-function-trio` section.
    specified *encoding* and *errors* or the :class:`io.TextIOWrapper` default.
    Otherwise, file objects are opened in binary mode.
 
+   If *env* is not ``None``, it must be a mapping that defines the environment
+   variables for the new process; these are used instead of the default
+   behavior of inheriting the current process' environment. It is passed directly
+   to :class:`Popen`.
+
    Examples::
 
       >>> subprocess.run(["ls", "-l"])  # doesn't capture output