https://github.com/python/cpython/commit/3d64fd88960cb6c8240174c4c6f5c640d190b257
commit: 3d64fd88960cb6c8240174c4c6f5c640d190b257
branch: 3.13
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: encukou <encu...@gmail.com>
date: 2025-02-26T09:59:12+01:00
summary:

[3.13] gh-130433: Update documentation for `MultipartConversionError` 
(GH-130436) (GH-130565)

(cherry picked from commit b536e371044f9e9b1b34cc8276a01e67550b5428)

Co-authored-by: Yuki Kobayashi <drsuaimqj...@gmail.com>

files:
M Doc/library/email.errors.rst

diff --git a/Doc/library/email.errors.rst b/Doc/library/email.errors.rst
index f8f43d82a3df2e..61142d58ca8280 100644
--- a/Doc/library/email.errors.rst
+++ b/Doc/library/email.errors.rst
@@ -45,18 +45,12 @@ The following exception classes are defined in the 
:mod:`email.errors` module:
 
 .. exception:: MultipartConversionError()
 
-   Raised when a payload is added to a :class:`~email.message.Message` object
-   using :meth:`add_payload`, but the payload is already a scalar and the
-   message's :mailheader:`Content-Type` main type is not either
-   :mimetype:`multipart` or missing.  :exc:`MultipartConversionError` multiply
-   inherits from :exc:`MessageError` and the built-in :exc:`TypeError`.
-
-   Since :meth:`Message.add_payload` is deprecated, this exception is rarely
-   raised in practice.  However the exception may also be raised if the
-   :meth:`~email.message.Message.attach`
-   method is called on an instance of a class derived from
+   Raised if the :meth:`~email.message.Message.attach` method is called
+   on an instance of a class derived from
    :class:`~email.mime.nonmultipart.MIMENonMultipart` (e.g.
    :class:`~email.mime.image.MIMEImage`).
+   :exc:`MultipartConversionError` multiply
+   inherits from :exc:`MessageError` and the built-in :exc:`TypeError`.
 
 
 .. exception:: HeaderWriteError()

_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com

Reply via email to