Merge remote-tracking branch 'origin/3.14' into backport-010bebb-3.14

Author: nascheme

Doc/c-api/datetime.rst

@@ -13,7 +13,7 @@ the module initialisation function.  The macro puts a pointer to a C structure
 into a static variable, :c:data:`PyDateTimeAPI`, that is used by the following
 macros.
 
-.. c:macro:: PyDateTime_IMPORT()
+.. c:macro:: PyDateTime_IMPORT
 
    Import the datetime C API.
 

Doc/c-api/init_config.rst

@@ -831,7 +831,7 @@ Example::
         if (PyStatus_Exception(status)) {
             Py_ExitStatusException(status);
         }
-        PyMem_Free(ptr);
+        PyMem_RawFree(ptr);
         return 0;
     }
 

Doc/howto/mro.rst

@@ -348,7 +348,7 @@ straightforward to compute the linearizations of O, X, Y, A and B:
 
  .. code-block:: text
 
-  L[O] = 0
+  L[O] = O
   L[X] = X O
   L[Y] = Y O
   L[A] = A X Y O

Doc/library/email.generator.rst

@@ -61,7 +61,7 @@ To accommodate reproducible processing of SMIME-signed messages
 
    If *maxheaderlen* is not ``None``, refold any header lines that are longer
    than *maxheaderlen*, or if ``0``, do not rewrap any headers.  If
-   *manheaderlen* is ``None`` (the default), wrap headers and other message
+   *maxheaderlen* is ``None`` (the default), wrap headers and other message
    lines according to the *policy* settings.
 
    If *policy* is specified, use that policy to control message generation.  If
@@ -137,7 +137,7 @@ a serialized binary representation of a message object.  For more detail, see
 Because strings cannot represent binary data, the :class:`Generator` class must
 convert any binary data in any message it flattens to an ASCII compatible
 format, by converting them to an ASCII compatible
-:mailheader:`Content-Transfer_Encoding`.  Using the terminology of the email
+:mailheader:`Content-Transfer-Encoding`.  Using the terminology of the email
 RFCs, you can think of this as :class:`Generator` serializing to an I/O stream
 that is not "8 bit clean".  In other words, most applications will want
 to be using :class:`BytesGenerator`, and not :class:`Generator`.
@@ -162,7 +162,7 @@ to be using :class:`BytesGenerator`, and not :class:`Generator`.
 
    If *maxheaderlen* is not ``None``, refold any header lines that are longer
    than *maxheaderlen*, or if ``0``, do not rewrap any headers.  If
-   *manheaderlen* is ``None`` (the default), wrap headers and other message
+   *maxheaderlen* is ``None`` (the default), wrap headers and other message
    lines according to the *policy* settings.
 
    If *policy* is specified, use that policy to control message generation.  If
@@ -267,7 +267,7 @@ in with information about the part.
 
       "[Non-text (%(type)s) part of message omitted, filename %(filename)s]"
 
-   Optional *_mangle_from_* and *maxheaderlen* are as with the
+   Optional *mangle_from_* and *maxheaderlen* are as with the
    :class:`Generator` base class.
 
 

Doc/library/email.message.rst

@@ -636,7 +636,7 @@ message objects.
    .. method:: make_mixed(boundary=None)
 
       Convert a non-``multipart``, a ``multipart/related``, or a
-      ``multipart-alternative`` into a ``multipart/mixed``, moving any existing
+      ``multipart/alternative`` into a ``multipart/mixed``, moving any existing
       :mailheader:`Content-` headers and payload into a (new) first part of the
       ``multipart``.  If *boundary* is specified, use it as the boundary string
       in the multipart, otherwise leave the boundary to be automatically

Doc/library/email.policy.rst

@@ -523,7 +523,7 @@ added matters.  To illustrate::
       If :attr:`~Policy.cte_type` is ``8bit``, non-ASCII binary data is
       converted back
       into bytes.  Headers with binary data are not refolded, regardless of the
-      ``refold_header`` setting, since there is no way to know whether the
+      ``refold_source`` setting, since there is no way to know whether the
       binary data consists of single byte characters or multibyte characters.
 
 

Doc/library/mailbox.rst

@@ -495,7 +495,7 @@ Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
    .. method:: set_info(key, info)
 
       Set the info of the message corresponding to *key* to *info*.
-      Calling ``some_mailbox.set_info(key, flags)`` is similar to ::
+      Calling ``some_mailbox.set_info(key, info)`` is similar to ::
 
          one_message = some_mailbox.get_message(key)
          one_message.set_info(info)

Doc/library/select.rst

@@ -547,7 +547,7 @@ https://man.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
    | :const:`KQ_FILTER_AIO`    | AIO requests.                               |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_FILTER_VNODE`  | Returns when one or more of the requested   |
-   |                           | events watched in *fflag* occurs.           |
+   |                           | events watched in *fflags* occurs.          |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_FILTER_PROC`   | Watch for events on a process ID.           |
    +---------------------------+---------------------------------------------+

Doc/library/termios.rst

@@ -39,6 +39,13 @@ The module defines the following functions:
    well as the indexing in the *cc* array must be done using the symbolic
    constants defined in the :mod:`!termios` module.
 
+   .. data:: VMIN
+             VTIME
+
+      Indices into the *cc* array controlling a non-canonical read: the minimum
+      number of characters to read and the timeout in tenths of a second,
+      respectively.
+
 
 .. function:: tcsetattr(fd, when, attributes)
 
@@ -77,13 +84,28 @@ The module defines the following functions:
    which queue: :const:`TCIFLUSH` for the input queue, :const:`TCOFLUSH` for the
    output queue, or :const:`TCIOFLUSH` for both queues.
 
+   .. data:: TCIFLUSH
+             TCOFLUSH
+             TCIOFLUSH
+
+      Values for the *queue* selector: the input queue, the output queue, or
+      both queues, respectively.
+
 
 .. function:: tcflow(fd, action)
 
    Suspend or resume input or output on file descriptor *fd*.  The *action*
    argument can be :const:`TCOOFF` to suspend output, :const:`TCOON` to restart
    output, :const:`TCIOFF` to suspend input, or :const:`TCION` to restart input.
 
+   .. data:: TCOOFF
+             TCOON
+             TCIOFF
+             TCION
+
+      Values for the *action* argument: suspend output, restart output,
+      suspend input, or restart input, respectively.
+
 
 .. function:: tcgetwinsize(fd)
 
@@ -93,6 +115,12 @@ The module defines the following functions:
 
    .. versionadded:: 3.11
 
+   .. data:: TIOCGWINSZ
+             TIOCGSIZE
+
+      ``ioctl()`` requests for querying the tty window size.  Not defined on
+      all platforms; :func:`tcgetwinsize` requires at least one of them.
+
 
 .. function:: tcsetwinsize(fd, winsize)
 
@@ -104,6 +132,12 @@ The module defines the following functions:
 
    .. versionadded:: 3.11
 
+   .. data:: TIOCSWINSZ
+             TIOCSSIZE
+
+      ``ioctl()`` requests for setting the tty window size.  Not defined on all
+      platforms; see :func:`tcsetwinsize` for the required pairs.
+
 
 .. seealso::
 

Doc/library/urllib.request.rst

@@ -72,6 +72,16 @@ The :mod:`!urllib.request` module defines the following functions:
 
    Raises :exc:`~urllib.error.URLError` on protocol errors.
 
+   Exceptions raised while reading or parsing an HTTP response are not
+   wrapped in :exc:`~urllib.error.URLError` and propagate unchanged.
+   These include subclasses of :exc:`http.client.HTTPException`, such as
+   :exc:`~http.client.BadStatusLine` for a malformed status line, and
+   subclasses of :exc:`OSError`, such as :exc:`TimeoutError` if the server
+   does not respond within *timeout* seconds, or
+   :exc:`~http.client.RemoteDisconnected` if the server closes the
+   connection without sending a response.  :exc:`ValueError` is raised if
+   *url* is not a valid URL.
+
    Note that ``None`` may be returned if no handler handles the request (though
    the default installed global :class:`OpenerDirector` uses
    :class:`UnknownHandler` to ensure this never happens).