diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-19 16:37:13 +0300 |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-10-19 16:37:13 +0300 |
commit | 989db5c880cbe85e49857cf44daf8b6c9ccbe0b6 (patch) | |
tree | 2e6fb67dca920efd5e8bdae70706badcc3472e43 /Doc/library/smtplib.rst | |
parent | 24c3b4928eb3046a02b55ab4317cee28aa1c56ba (diff) | |
parent | ecf41da83e5db98734b19f205899168cc56da943 (diff) | |
download | cpython-git-989db5c880cbe85e49857cf44daf8b6c9ccbe0b6.tar.gz |
Issue #19795: Mark up None as literal text.
Diffstat (limited to 'Doc/library/smtplib.rst')
-rw-r--r-- | Doc/library/smtplib.rst | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst index 1cb3aafcf3..86e769e6a1 100644 --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -349,10 +349,10 @@ An :class:`SMTP` instance has the following methods: :rfc:`4954` "initial response" bytes which will be encoded and sent with the ``AUTH`` command as below. If the ``authobject()`` does not support an initial response (e.g. because it requires a challenge), it should return - None when called with ``challenge=None``. If *initial_response_ok* is - false, then ``authobject()`` will not be called first with None. + ``None`` when called with ``challenge=None``. If *initial_response_ok* is + false, then ``authobject()`` will not be called first with ``None``. - If the initial response check returns None, or if *initial_response_ok* is + If the initial response check returns ``None``, or if *initial_response_ok* is false, ``authobject()`` will be called to process the server's challenge response; the *challenge* argument it is passed will be a ``bytes``. It should return ``bytes`` *data* that will be base64 encoded and sent to the @@ -382,8 +382,9 @@ An :class:`SMTP` instance has the following methods: If *keyfile* and *certfile* are provided, these are passed to the :mod:`socket` module's :func:`ssl` function. - Optional *context* parameter is a :class:`ssl.SSLContext` object; This is an alternative to - using a keyfile and a certfile and if specified both *keyfile* and *certfile* should be None. + Optional *context* parameter is a :class:`ssl.SSLContext` object; This is + an alternative to using a keyfile and a certfile and if specified both + *keyfile* and *certfile* should be ``None``. If there has been no previous ``EHLO`` or ``HELO`` command this session, this method tries ESMTP ``EHLO`` first. |