Kaydet (Commit) 1e5d54cf authored tarafından Jelle Zijlstra's avatar Jelle Zijlstra Kaydeden (comit) Antoine Pitrou

bpo-31965: fix doc for multiprocessing.connection.Client and Listener (#4304)

* fix doc for multiprocessing.connection.Client

The authenticate argument does not exist on either Client or Listener:
- https://github.com/python/cpython/blob/master/Lib/multiprocessing/connection.py#L483 (master)
- https://github.com/python/cpython/blob/3.6/Lib/multiprocessing/connection.py#L478 (3.6)
- https://github.com/python/cpython/blob/3.5/Lib/multiprocessing/connection.py#L478 (3.5)
- https://github.com/python/cpython/blob/3.4/Lib/multiprocessing/connection.py#L487 (3.4)
The documentation also claimed that these functions will call `current_process().auth_key`, for which I could find no evidence in the code. I rewrote the documentation to reflect the actual behavior.

Also made some small changes to vary sentence structure.
üst 22b11285
...@@ -2296,7 +2296,7 @@ multiple connections at the same time. ...@@ -2296,7 +2296,7 @@ multiple connections at the same time.
If a welcome message is not received, then If a welcome message is not received, then
:exc:`~multiprocessing.AuthenticationError` is raised. :exc:`~multiprocessing.AuthenticationError` is raised.
.. function:: Client(address[, family[, authenticate[, authkey]]]) .. function:: Client(address[, family[, authkey]])
Attempt to set up a connection to the listener which is using address Attempt to set up a connection to the listener which is using address
*address*, returning a :class:`~multiprocessing.Connection`. *address*, returning a :class:`~multiprocessing.Connection`.
...@@ -2305,14 +2305,13 @@ multiple connections at the same time. ...@@ -2305,14 +2305,13 @@ multiple connections at the same time.
generally be omitted since it can usually be inferred from the format of generally be omitted since it can usually be inferred from the format of
*address*. (See :ref:`multiprocessing-address-formats`) *address*. (See :ref:`multiprocessing-address-formats`)
If *authenticate* is ``True`` or *authkey* is a byte string then digest If *authkey* is given and not None, it should be a byte string and will be
authentication is used. The key used for authentication will be either used as the secret key for an HMAC-based authentication challenge. No
*authkey* or ``current_process().authkey`` if *authkey* is ``None``. authentication is done if *authkey* is None.
If authentication fails then :exc:`~multiprocessing.AuthenticationError` is raised if authentication fails.
:exc:`~multiprocessing.AuthenticationError` is raised. See See :ref:`multiprocessing-auth-keys`.
:ref:`multiprocessing-auth-keys`.
.. class:: Listener([address[, family[, backlog[, authenticate[, authkey]]]]]) .. class:: Listener([address[, family[, backlog[, authkey]]]])
A wrapper for a bound socket or Windows named pipe which is 'listening' for A wrapper for a bound socket or Windows named pipe which is 'listening' for
connections. connections.
...@@ -2341,17 +2340,10 @@ multiple connections at the same time. ...@@ -2341,17 +2340,10 @@ multiple connections at the same time.
to the :meth:`~socket.socket.listen` method of the socket once it has been to the :meth:`~socket.socket.listen` method of the socket once it has been
bound. bound.
If *authenticate* is ``True`` (``False`` by default) or *authkey* is not If *authkey* is given and not None, it should be a byte string and will be
``None`` then digest authentication is used. used as the secret key for an HMAC-based authentication challenge. No
authentication is done if *authkey* is None.
If *authkey* is a byte string then it will be used as the :exc:`~multiprocessing.AuthenticationError` is raised if authentication fails.
authentication key; otherwise it must be ``None``.
If *authkey* is ``None`` and *authenticate* is ``True`` then
``current_process().authkey`` is used as the authentication key. If
*authkey* is ``None`` and *authenticate* is ``False`` then no
authentication is done. If authentication fails then
:exc:`~multiprocessing.AuthenticationError` is raised.
See :ref:`multiprocessing-auth-keys`. See :ref:`multiprocessing-auth-keys`.
.. method:: accept() .. method:: accept()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment