summaryrefslogtreecommitdiffstats
path: root/Lib/smtplib.py
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-06-23 20:10:37 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-06-23 20:10:37 (GMT)
commit9575222b7f4325f6f61fcc2a84b0d3c2d0bc0470 (patch)
treed356278a5b9dee6b1569408516f109cf706a977c /Lib/smtplib.py
parent7f01d553338bd67cc8c8113df9043bc125f04e94 (diff)
downloadcpython-9575222b7f4325f6f61fcc2a84b0d3c2d0bc0470.zip
cpython-9575222b7f4325f6f61fcc2a84b0d3c2d0bc0470.tar.gz
cpython-9575222b7f4325f6f61fcc2a84b0d3c2d0bc0470.tar.bz2
#18179: reflow paragraphs.
Diffstat (limited to 'Lib/smtplib.py')
-rwxr-xr-xLib/smtplib.py32
1 files changed, 17 insertions, 15 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 2c8dc42..7f07840 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -238,11 +238,11 @@ class SMTP:
If specified, `host' is the name of the remote host to which to
connect. If specified, `port' specifies the port to which to connect.
By default, smtplib.SMTP_PORT is used. If a host is specified the
- connect method is called, and if it returns anything other than
- a success code an SMTPConnectError is raised. If specified,
+ connect method is called, and if it returns anything other than a
+ success code an SMTPConnectError is raised. If specified,
`local_hostname` is used as the FQDN of the local host for the
- HELO/EHLO command. Otherwise,
- the local hostname is found using socket.getfqdn().
+ HELO/EHLO command. Otherwise, the local hostname is found using
+ socket.getfqdn().
"""
self.timeout = timeout
@@ -760,13 +760,15 @@ class SMTP:
if _have_ssl:
class SMTP_SSL(SMTP):
- """ This is a subclass derived from SMTP that connects over an SSL encrypted
- socket (to use this class you need a socket module that was compiled with SSL
- support). If host is not specified, '' (the local host) is used. If port is
- omitted, the standard SMTP-over-SSL port (465) is used. local_hostname
- has the same meaning as it does in the SMTP class. keyfile and certfile
- are also optional - they can contain a PEM formatted private key and
- certificate chain file for the SSL connection.
+ """ This is a subclass derived from SMTP that connects over an SSL
+ encrypted socket (to use this class you need a socket module that was
+ compiled with SSL support). If host is not specified, '' (the local
+ host) is used. If port is omitted, the standard SMTP-over-SSL port
+ (465) is used. local_hostname has the same meaning as it does in the
+ SMTP class. keyfile and certfile are also optional - they can contain
+ a PEM formatted private key and certificate chain file for the SSL
+ connection.
+
"""
default_port = SMTP_SSL_PORT
@@ -797,10 +799,10 @@ class LMTP(SMTP):
"""LMTP - Local Mail Transfer Protocol
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 connect() method must support that as well as a regular
- host:port server. local_hostname has the same meaning as it does in the
- SMTP class. To specify a Unix socket, you must use an absolute
+ on the standard SMTP client. It's common to use Unix sockets for
+ LMTP, so our connect() method must support that as well as a regular
+ host:port server. local_hostname has the same meaning as it does in
+ the SMTP class. To specify a Unix socket, you must use an absolute
path as the host, starting with a '/'.
Authentication is supported, using the regular SMTP mechanism. When