diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-05-29 20:43:24 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-05-29 20:43:24 (GMT) |
| commit | 8c740c4d1980d811ff5614fa3b538fce499a725b (patch) | |
| tree | 9d64c77c7e0ff6e2125b6e6841be2f8fc902e2c2 /Doc/library/smtpd.rst | |
| parent | ea083fafd55ecfe718df72ac42c5063910e089c6 (diff) | |
| download | cpython-8c740c4d1980d811ff5614fa3b538fce499a725b.zip cpython-8c740c4d1980d811ff5614fa3b538fce499a725b.tar.gz cpython-8c740c4d1980d811ff5614fa3b538fce499a725b.tar.bz2 | |
Improved docs for issue27033. Based on comments by R. David Murray.
Diffstat (limited to 'Doc/library/smtpd.rst')
| -rw-r--r-- | Doc/library/smtpd.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst index 2466e38..ad6bd3c 100644 --- a/Doc/library/smtpd.rst +++ b/Doc/library/smtpd.rst @@ -52,8 +52,8 @@ SMTPServer Objects cannot be set to ``True`` at the same time. *decode_data* specifies whether the data portion of the SMTP transaction - should be decoded using UTF-8. The default is ``False``. When - *decode_data* is not set to ``True`` the server advertises the ``8BITMIME`` + should be decoded using UTF-8. When *decode_data* is ``False`` (the + default), the server advertises the ``8BITMIME`` extension (:rfc:`6152`), accepts the ``BODY=8BITMIME`` parameter to the ``MAIL`` command, and when present passes it to :meth:`process_message` in the ``kwargs['mail_options']`` list. *decode_data* and *enable_SMTPUTF8* @@ -70,7 +70,7 @@ SMTPServer Objects format). If the *decode_data* constructor keyword is set to ``True``, the *data* - parameter will be a unicode string. If it is set to ``False``, it + argument will be a unicode string. If it is set to ``False``, it will be a bytes object. *kwargs* is a dictionary containing additional information. It is empty @@ -107,8 +107,8 @@ SMTPServer Objects .. versionadded:: 3.5 The *decode_data* and *enable_SMTPUTF8* constructor parameters, and the - *kwargs* parameter to :meth:`process_message` when one or more of these is - specified. + *kwargs* parameter to :meth:`process_message` when *decode_data* is + ``False``. .. versionchanged:: 3.6 *decode_data* is now ``False`` by default. |