[pull] main from python:main

Doc/library/smtplib.rst

@@ -458,9 +458,11 @@ An :class:`SMTP` instance has the following methods:
    Send mail.  The required arguments are an :rfc:`822` from-address string, a list
    of :rfc:`822` to-address strings (a bare string will be treated as a list with 1
    address), and a message string.  The caller may pass a list of ESMTP options
-   (such as ``8bitmime``) to be used in ``MAIL FROM`` commands as *mail_options*.
+   (such as ``"8bitmime"``) to be used in ``MAIL FROM`` commands as *mail_options*.
    ESMTP options (such as ``DSN`` commands) that should be used with all ``RCPT``
-   commands can be passed as *rcpt_options*.  (If you need to use different ESMTP
+   commands can be passed as *rcpt_options*. Each option should be passed as a string
+   containing the full text of the option, including any potential key
+   (for instance, ``"NOTIFY=SUCCESS,FAILURE"``). (If you need to use different ESMTP
    options to different recipients you have to use the low-level methods such as
    :meth:`!mail`, :meth:`!rcpt` and :meth:`!data` to send the message.)
 

Doc/library/stdtypes.rst

@@ -5475,9 +5475,11 @@ before the statement body is executed and exited when the statement ends:
    Returning a true value from this method will cause the :keyword:`with` statement
    to suppress the exception and continue execution with the statement immediately
    following the :keyword:`!with` statement. Otherwise the exception continues
-   propagating after this method has finished executing. Exceptions that occur
-   during execution of this method will replace any exception that occurred in the
-   body of the :keyword:`!with` statement.
+   propagating after this method has finished executing.
+
+   If this method raises an exception while handling an earlier exception from the
+   :keyword:`with` block, the new exception is raised, and the original exception
+   is stored in its :attr:`~BaseException.__context__` attribute.
 
    The exception passed in should never be reraised explicitly - instead, this
    method should return a false value to indicate that the method completed

Modules/_decimal/_decimal.c

@@ -7753,8 +7753,9 @@ _decimal_exec(PyObject *m)
 
     /* DecimalTuple */
     ASSIGN_PTR(collections, PyImport_ImportModule("collections"));
-    obj = PyObject_CallMethod(collections, "namedtuple", "(ss)", "DecimalTuple",
-                              "sign digits exponent");
+    ASSIGN_PTR(obj, PyObject_CallMethod(collections, "namedtuple", "(ss)",
+                                        "DecimalTuple",
+                                        "sign digits exponent"));
     if (!PyType_Check(obj)) {
         PyErr_SetString(PyExc_TypeError,
                         "type is expected from namedtuple call");