diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-12-31 05:09:20 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-12-31 05:09:20 (GMT) |
| commit | 4032802eb6ed855fe34fffe4ae2d2c07f6e38c61 (patch) | |
| tree | 31b094bb72dae0579c3516df182b527f5bfc612d /Doc/library/smtplib.rst | |
| parent | 5e8767c764d66c4ca09921ce73097f89dd1dbc6e (diff) | |
| parent | a6c4a10d4e70aa81fcee842f84b71e8c8e7fb142 (diff) | |
| download | cpython-4032802eb6ed855fe34fffe4ae2d2c07f6e38c61.zip cpython-4032802eb6ed855fe34fffe4ae2d2c07f6e38c61.tar.gz cpython-4032802eb6ed855fe34fffe4ae2d2c07f6e38c61.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Doc/library/smtplib.rst')
| -rw-r--r-- | Doc/library/smtplib.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst index 7dd038d..45c5d6d 100644 --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -323,10 +323,10 @@ An :class:`SMTP` instance has the following methods: envelope used by the transport agents. ``sendmail`` does not modify the 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`` - and ``\n`` characters are converted to ``\r\n`` characters. A byte string - is not modified. + and ``\n`` characters are converted to ``\r\n`` characters. A byte string is + not modified. 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 |