diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2011-07-31 01:14:17 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2011-07-31 01:14:17 (GMT) |
| commit | b351a48eee11b8fc19bd7502db0bab02135b69b5 (patch) | |
| tree | 7c442d00c0a61b6fcfba744929e7d871d5a3a7c1 /Doc/library/smtplib.rst | |
| parent | 3fc5868a1d123996936c2feb6625865f5bb88b37 (diff) | |
| download | cpython-b351a48eee11b8fc19bd7502db0bab02135b69b5.zip cpython-b351a48eee11b8fc19bd7502db0bab02135b69b5.tar.gz cpython-b351a48eee11b8fc19bd7502db0bab02135b69b5.tar.bz2 | |
Addressing the review comments by Antoine Pitrou for smtplib.py and test_smtplib.py. Review comments by Ezio Melotti for smtplib.rst
Diffstat (limited to 'Doc/library/smtplib.rst')
| -rw-r--r-- | Doc/library/smtplib.rst | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst index 4a0f756..7dd038d 100644 --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -31,9 +31,9 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions). like the connection attempt (if not specified, the global default timeout setting will be used). The optional source_address parameter allows to bind to some specific source address in a machine with multiple network interfaces, - and/or to some specific source tcp port. It takes a 2-tuple (host, port), + and/or to some specific source TCP port. It takes a 2-tuple (host, port), for the socket to bind to as its source address before connecting. If - ommited (or if host or port are '' and/or 0 respectively) the OS default + omitted (or if host or port are ``''`` and/or 0 respectively) the OS default behavior will be used. For normal use, you should only require the initialization/connect, @@ -53,8 +53,8 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions). .. versionchanged:: 3.3 Support for the :keyword:`with` statement was added. - .. versionadded:: 3.3 - source_address parameter. + .. versionchanged:: 3.3 + source_address argument was added. .. class:: SMTP_SSL(host='', port=0, local_hostname=None, keyfile=None, certfile=None[, timeout], context=None, source_address=None) @@ -73,14 +73,14 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions). specific source address in a machine with multiple network interfaces, and/or to some specific source tcp port. It takes a 2-tuple (host, port), for the socket to bind to as its source address before connecting. If - ommited (or if host or port are '' and/or 0 respectively) the OS default + omitted (or if host or port are ``''`` and/or 0 respectively) the OS default behavior will be used. .. versionchanged:: 3.3 *context* was added. - .. versionadded:: 3.3 - source_address parameter. + .. versionchanged:: 3.3 + source_address argument was added. .. class:: LMTP(host='', port=LMTP_PORT, local_hostname=None, source_address=None) @@ -88,8 +88,8 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions). The LMTP protocol, which is very similar to ESMTP, is heavily based on the standard SMTP client. It's common to use Unix sockets for LMTP, so our :meth:`connect` method must support that as well as a regular host:port - server. The optional parameters local_hostname and source_address has the - same meaning as that of SMTP client.To specify a Unix socket, you must use + server. The optional arguments local_hostname and source_address have the + same meaning as that of SMTP client. To specify a Unix socket, you must use an absolute path for *host*, starting with a '/'. Authentication is supported, using the regular SMTP mechanism. When using a Unix |