Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
f0d4c640
Commit
f0d4c640
authored
May 27, 2019
by
sbstp
Committed by
Miss Islington (bot)
May 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-36686: Improve the documentation of the std* params in loop.subprocess_exec (GH-13586)
https://bugs.python.org/issue36686
parent
a3568417
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
158 additions
and
25 deletions
+158
-25
Doc/library/asyncio-eventloop.rst
Doc/library/asyncio-eventloop.rst
+44
-24
Lib/asyncio/base_events.py
Lib/asyncio/base_events.py
+18
-1
Lib/test/test_asyncio/test_subprocess.py
Lib/test/test_asyncio/test_subprocess.py
+90
-0
Misc/NEWS.d/next/Documentation/2019-05-27-17-28-58.bpo-36686.Zot4sx.rst
...xt/Documentation/2019-05-27-17-28-58.bpo-36686.Zot4sx.rst
+6
-0
No files found.
Doc/library/asyncio-eventloop.rst
View file @
f0d4c640
...
...
@@ -1217,32 +1217,52 @@ async/await code consider using the high-level
Other parameters:
* *stdin*: either a file-like object representing a pipe to be
connected to the subprocess's standard input stream using
:meth:`~loop.connect_write_pipe`, or the
:const:`subprocess.PIPE` constant (default). By default a new
pipe will be created and connected.
* *stdout*: either a file-like object representing the pipe to be
connected to the subprocess's standard output stream using
:meth:`~loop.connect_read_pipe`, or the
:const:`subprocess.PIPE` constant (default). By default a new pipe
will be created and connected.
* *stderr*: either a file-like object representing the pipe to be
connected to the subprocess's standard error stream using
:meth:`~loop.connect_read_pipe`, or one of
:const:`subprocess.PIPE` (default) or :const:`subprocess.STDOUT`
constants.
By default a new pipe will be created and connected. When
:const:`subprocess.STDOUT` is specified, the subprocess' standard
error stream will be connected to the same pipe as the standard
output stream.
* *stdin* can be any of these:
* a file-like object representing a pipe to be connected to the
subprocess's standard input stream using
:meth:`~loop.connect_write_pipe`
* the :const:`subprocess.PIPE` constant (default) which will create a new
pipe and connect it,
* the value ``None`` which will make the subprocess inherit the file
descriptor from this process
* the :const:`subprocess.DEVNULL` constant which indicates that the
special :data:`os.devnull` file will be used
* *stdout* can be any of these:
* a file-like object representing a pipe to be connected to the
subprocess's standard output stream using
:meth:`~loop.connect_write_pipe`
* the :const:`subprocess.PIPE` constant (default) which will create a new
pipe and connect it,
* the value ``None`` which will make the subprocess inherit the file
descriptor from this process
* the :const:`subprocess.DEVNULL` constant which indicates that the
special :data:`os.devnull` file will be used
* *stderr* can be any of these:
* a file-like object representing a pipe to be connected to the
subprocess's standard error stream using
:meth:`~loop.connect_write_pipe`
* the :const:`subprocess.PIPE` constant (default) which will create a new
pipe and connect it,
* the value ``None`` which will make the subprocess inherit the file
descriptor from this process
* the :const:`subprocess.DEVNULL` constant which indicates that the
special :data:`os.devnull` file will be used
* the :const:`subprocess.STDOUT` constant which will connect the standard
error stream to the process' standard output stream
* All other keyword arguments are passed to :class:`subprocess.Popen`
without interpretation, except for *bufsize*, *universal_newlines*
and *shell*, which should not be specified at all.
without interpretation, except for *bufsize*, *universal_newlines*,
*shell*, *text*, *encoding* and *errors*, which should not be specified
at all.
The ``asyncio`` subprocess API does not support decoding the streams
as text. :func:`bytes.decode` can be used to convert the bytes returned
from the stream to text.
See the constructor of the :class:`subprocess.Popen` class
for documentation on other arguments.
...
...
Lib/asyncio/base_events.py
View file @
f0d4c640
...
...
@@ -1555,6 +1555,7 @@ class BaseEventLoop(events.AbstractEventLoop):
stderr
=
subprocess
.
PIPE
,
universal_newlines
=
False
,
shell
=
True
,
bufsize
=
0
,
encoding
=
None
,
errors
=
None
,
text
=
None
,
**
kwargs
):
if
not
isinstance
(
cmd
,
(
bytes
,
str
)):
raise
ValueError
(
"cmd must be a string"
)
...
...
@@ -1564,6 +1565,13 @@ class BaseEventLoop(events.AbstractEventLoop):
raise
ValueError
(
"shell must be True"
)
if
bufsize
!=
0
:
raise
ValueError
(
"bufsize must be 0"
)
if
text
:
raise
ValueError
(
"text must be False"
)
if
encoding
is
not
None
:
raise
ValueError
(
"encoding must be None"
)
if
errors
is
not
None
:
raise
ValueError
(
"errors must be None"
)
protocol
=
protocol_factory
()
debug_log
=
None
if
self
.
_debug
:
...
...
@@ -1580,13 +1588,22 @@ class BaseEventLoop(events.AbstractEventLoop):
async
def
subprocess_exec
(
self
,
protocol_factory
,
program
,
*
args
,
stdin
=
subprocess
.
PIPE
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
,
universal_newlines
=
False
,
shell
=
False
,
bufsize
=
0
,
**
kwargs
):
shell
=
False
,
bufsize
=
0
,
encoding
=
None
,
errors
=
None
,
text
=
None
,
**
kwargs
):
if
universal_newlines
:
raise
ValueError
(
"universal_newlines must be False"
)
if
shell
:
raise
ValueError
(
"shell must be False"
)
if
bufsize
!=
0
:
raise
ValueError
(
"bufsize must be 0"
)
if
text
:
raise
ValueError
(
"text must be False"
)
if
encoding
is
not
None
:
raise
ValueError
(
"encoding must be None"
)
if
errors
is
not
None
:
raise
ValueError
(
"errors must be None"
)
popen_args
=
(
program
,)
+
args
for
arg
in
popen_args
:
if
not
isinstance
(
arg
,
(
str
,
bytes
)):
...
...
Lib/test/test_asyncio/test_subprocess.py
View file @
f0d4c640
...
...
@@ -335,6 +335,63 @@ class SubprocessMixin:
self
.
assertEqual
(
output
.
rstrip
(),
b'0'
)
self
.
assertEqual
(
exitcode
,
0
)
def
test_devnull_input
(
self
):
async
def
empty_input
():
code
=
'import sys; data = sys.stdin.read(); print(len(data))'
proc
=
await
asyncio
.
create_subprocess_exec
(
sys
.
executable
,
'-c'
,
code
,
stdin
=
asyncio
.
subprocess
.
DEVNULL
,
stdout
=
asyncio
.
subprocess
.
PIPE
,
stderr
=
asyncio
.
subprocess
.
PIPE
,
close_fds
=
False
,
loop
=
self
.
loop
)
stdout
,
stderr
=
await
proc
.
communicate
()
exitcode
=
await
proc
.
wait
()
return
(
stdout
,
exitcode
)
output
,
exitcode
=
self
.
loop
.
run_until_complete
(
empty_input
())
self
.
assertEqual
(
output
.
rstrip
(),
b'0'
)
self
.
assertEqual
(
exitcode
,
0
)
def
test_devnull_output
(
self
):
async
def
empty_output
():
code
=
'import sys; data = sys.stdin.read(); print(len(data))'
proc
=
await
asyncio
.
create_subprocess_exec
(
sys
.
executable
,
'-c'
,
code
,
stdin
=
asyncio
.
subprocess
.
PIPE
,
stdout
=
asyncio
.
subprocess
.
DEVNULL
,
stderr
=
asyncio
.
subprocess
.
PIPE
,
close_fds
=
False
,
loop
=
self
.
loop
)
stdout
,
stderr
=
await
proc
.
communicate
(
b"abc"
)
exitcode
=
await
proc
.
wait
()
return
(
stdout
,
exitcode
)
output
,
exitcode
=
self
.
loop
.
run_until_complete
(
empty_output
())
self
.
assertEqual
(
output
,
None
)
self
.
assertEqual
(
exitcode
,
0
)
def
test_devnull_error
(
self
):
async
def
empty_error
():
code
=
'import sys; data = sys.stdin.read(); print(len(data))'
proc
=
await
asyncio
.
create_subprocess_exec
(
sys
.
executable
,
'-c'
,
code
,
stdin
=
asyncio
.
subprocess
.
PIPE
,
stdout
=
asyncio
.
subprocess
.
PIPE
,
stderr
=
asyncio
.
subprocess
.
DEVNULL
,
close_fds
=
False
,
loop
=
self
.
loop
)
stdout
,
stderr
=
await
proc
.
communicate
(
b"abc"
)
exitcode
=
await
proc
.
wait
()
return
(
stderr
,
exitcode
)
output
,
exitcode
=
self
.
loop
.
run_until_complete
(
empty_error
())
self
.
assertEqual
(
output
,
None
)
self
.
assertEqual
(
exitcode
,
0
)
def
test_cancel_process_wait
(
self
):
# Issue #23140: cancel Process.wait()
...
...
@@ -531,6 +588,39 @@ class SubprocessMixin:
with
self
.
assertWarns
(
DeprecationWarning
):
subprocess
.
Process
(
transp
,
proto
,
loop
=
self
.
loop
)
def
test_create_subprocess_exec_text_mode_fails
(
self
):
async
def
execute
():
with
self
.
assertRaises
(
ValueError
):
await
subprocess
.
create_subprocess_exec
(
sys
.
executable
,
text
=
True
)
with
self
.
assertRaises
(
ValueError
):
await
subprocess
.
create_subprocess_exec
(
sys
.
executable
,
encoding
=
"utf-8"
)
with
self
.
assertRaises
(
ValueError
):
await
subprocess
.
create_subprocess_exec
(
sys
.
executable
,
errors
=
"strict"
)
self
.
loop
.
run_until_complete
(
execute
())
def
test_create_subprocess_shell_text_mode_fails
(
self
):
async
def
execute
():
with
self
.
assertRaises
(
ValueError
):
await
subprocess
.
create_subprocess_shell
(
sys
.
executable
,
text
=
True
)
with
self
.
assertRaises
(
ValueError
):
await
subprocess
.
create_subprocess_shell
(
sys
.
executable
,
encoding
=
"utf-8"
)
with
self
.
assertRaises
(
ValueError
):
await
subprocess
.
create_subprocess_shell
(
sys
.
executable
,
errors
=
"strict"
)
self
.
loop
.
run_until_complete
(
execute
())
if
sys
.
platform
!=
'win32'
:
# Unix
...
...
Misc/NEWS.d/next/Documentation/2019-05-27-17-28-58.bpo-36686.Zot4sx.rst
0 → 100644
View file @
f0d4c640
Improve documentation of the stdin, stdout, and stderr arguments of of the
``asyncio.subprocess_exec`` function to specficy which values are supported.
Also mention that decoding as text is not supported.
Add a few tests to verify that the various values passed to the std*
arguments actually work.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment