summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-02-07 17:40:37 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-02-07 17:40:37 (GMT)
commit27e9de669be928b09d71fdd31f84da7b86f9a1fc (patch)
tree7a337c8b0a5b6f4ae0beb7c3e38b37aa61b21d33 /Doc
parent790202d61308efd3e7bc69cd61bff2306d789e57 (diff)
downloadcpython-27e9de669be928b09d71fdd31f84da7b86f9a1fc.zip
cpython-27e9de669be928b09d71fdd31f84da7b86f9a1fc.tar.gz
cpython-27e9de669be928b09d71fdd31f84da7b86f9a1fc.tar.bz2
#20531: Revert e20f98a8ed71, the 3.4 version of the #19063 fix.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/email.message.rst8
1 files changed, 1 insertions, 7 deletions
diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst
index 1769585..84a5f51 100644
--- a/Doc/library/email.message.rst
+++ b/Doc/library/email.message.rst
@@ -196,13 +196,7 @@ Here are the methods of the :class:`Message` class:
Set the entire message object's payload to *payload*. It is the client's
responsibility to ensure the payload invariants. Optional *charset* sets
- the message's character set; see :meth:`set_charset` for details. If
- *payload* is a string containing non-ASCII characters, *charset* is
- required.
-
- .. versionchanged:: 3.4
- Previous to 3.4 *charset* was not required when *payload* was a
- non-ASCII string, but omitting it produced nonsense results.
+ the message's default character set; see :meth:`set_charset` for details.
.. method:: set_charset(charset)