Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.2

This commit is contained in:
Benjamin Peterson 2011-12-30 23:09:20 -06:00
parent 5e8767c764 a6c4a10d4e
commit 4032802eb6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/smtplib.rst
View File

@ -323,10 +323,10 @@ An :class:`SMTP` instance has the following methods:
envelope used by the transport agents. ``sendmail`` does not modify the envelope used by the transport agents. ``sendmail`` does not modify the
message headers in any way. message headers in any way.
msg may be a string containing characters in the ASCII range, or a byte *msg* may be a string containing characters in the ASCII range, or a byte
string. A string is encoded to bytes using the ascii codec, and lone ``\r`` string. A string is encoded to bytes using the ascii codec, and lone ``\r``
and ``\n`` characters are converted to ``\r\n`` characters. A byte string and ``\n`` characters are converted to ``\r\n`` characters. A byte string is
is not modified. not modified.
If there has been no previous ``EHLO`` or ``HELO`` command this session, this If there has been no previous ``EHLO`` or ``HELO`` command this session, this
method tries ESMTP ``EHLO`` first. If the server does ESMTP, message size and method tries ESMTP ``EHLO`` first. If the server does ESMTP, message size and