summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2018-01-29 04:51:08 (GMT)
committerGitHub <noreply@github.com>2018-01-29 04:51:08 (GMT)
commit07627e9a6a5f418354ff3dc99a0f36bc5b79dcd8 (patch)
tree6ea22b7bf243aba860d34de638fe223e52315513
parent9ee1bf9ab5af8233ed8ec5c53d12a29dc1bd9c9d (diff)
downloadcpython-07627e9a6a5f418354ff3dc99a0f36bc5b79dcd8.zip
cpython-07627e9a6a5f418354ff3dc99a0f36bc5b79dcd8.tar.gz
cpython-07627e9a6a5f418354ff3dc99a0f36bc5b79dcd8.tar.bz2
bpo-32251: Fix docs (#5408)
-rw-r--r--Doc/library/asyncio-protocol.rst5
-rw-r--r--Lib/asyncio/protocols.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst
index a08c4d3..004cac8 100644
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
@@ -451,7 +451,7 @@ Streaming protocols with manual receive buffer control
.. versionadded:: 3.7
**Important:** :class:`BufferedProtocol` has been been added to
- asyncio in Python 3.7 *on a provisional basis*! Treat it as an
+ asyncio in Python 3.7 *on a provisional basis*! Consider it as an
experimental API that might be changed or removed in Python 3.8.
@@ -487,7 +487,8 @@ instances:
:meth:`get_buffer` can be called an arbitrary number of times during
a connection. However, :meth:`eof_received` is called at most once
-and, if called, :meth:`data_received` won't be called after it.
+and, if called, :meth:`get_buffer` and :meth:`buffer_updated`
+won't be called after it.
State machine:
diff --git a/Lib/asyncio/protocols.py b/Lib/asyncio/protocols.py
index 9e786dc..8904478 100644
--- a/Lib/asyncio/protocols.py
+++ b/Lib/asyncio/protocols.py
@@ -106,7 +106,7 @@ class BufferedProtocol(BaseProtocol):
"""Interface for stream protocol with manual buffer control.
Important: this has been been added to asyncio in Python 3.7
- *on a provisional basis*! Treat it as an experimental API that
+ *on a provisional basis*! Consider it as an experimental API that
might be changed or removed in Python 3.8.
Event methods, such as `create_server` and `create_connection`,