mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
gh-87901: Remove the encoding argument from os.popen (GH-92836)
This commit is contained in:
parent
f2d994da10
commit
96f65835f8
|
@ -3916,13 +3916,13 @@ written in Python, such as a mail server's external command delivery program.
|
|||
.. availability:: Unix.
|
||||
|
||||
|
||||
.. function:: popen(cmd, mode='r', buffering=-1, encoding=None)
|
||||
.. function:: popen(cmd, mode='r', buffering=-1)
|
||||
|
||||
Open a pipe to or from command *cmd*.
|
||||
The return value is an open file object
|
||||
connected to the pipe, which can be read or written depending on whether *mode*
|
||||
is ``'r'`` (default) or ``'w'``.
|
||||
The *buffering* and *encoding* arguments have the same meaning as
|
||||
The *buffering* argument have the same meaning as
|
||||
the corresponding argument to the built-in :func:`open` function. The
|
||||
returned file object reads or writes text strings rather than bytes.
|
||||
|
||||
|
@ -3945,8 +3945,13 @@ written in Python, such as a mail server's external command delivery program.
|
|||
documentation for more powerful ways to manage and communicate with
|
||||
subprocesses.
|
||||
|
||||
.. versionchanged:: 3.11
|
||||
Added the *encoding* parameter.
|
||||
.. note::
|
||||
The :ref:`Python UTF-8 Mode <utf8-mode>` affects encodings used
|
||||
for *cmd* and pipe contents.
|
||||
|
||||
:func:`popen` is a simple wrapper around :class:`subprocess.Popen`.
|
||||
Use :class:`subprocess.Popen` or :func:`subprocess.run` to
|
||||
control options like encodings.
|
||||
|
||||
|
||||
.. function:: posix_spawn(path, argv, env, *, file_actions=None, \
|
||||
|
|
|
@ -974,15 +974,14 @@ def spawnlpe(mode, file, *args):
|
|||
# command in a shell can't be supported.
|
||||
if sys.platform != 'vxworks':
|
||||
# Supply os.popen()
|
||||
def popen(cmd, mode="r", buffering=-1, encoding=None):
|
||||
def popen(cmd, mode="r", buffering=-1):
|
||||
if not isinstance(cmd, str):
|
||||
raise TypeError("invalid cmd type (%s, expected string)" % type(cmd))
|
||||
if mode not in ("r", "w"):
|
||||
raise ValueError("invalid mode %r" % mode)
|
||||
if buffering == 0 or buffering is None:
|
||||
raise ValueError("popen() does not support unbuffered streams")
|
||||
import subprocess, io
|
||||
encoding = io.text_encoding(encoding)
|
||||
import subprocess
|
||||
if mode == "r":
|
||||
proc = subprocess.Popen(cmd,
|
||||
shell=True, text=True,
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Removed the ``encoding`` argument from :func:`os.popen` that was added in
|
||||
3.11b1.
|
Loading…
Reference in a new issue