summaryrefslogtreecommitdiffstats
path: root/Lib/smtplib.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-05-07 17:39:37 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-05-07 17:39:37 (GMT)
commitc1d520634a25fac5dea41f3af70273fc0b3a11ae (patch)
tree3f35688d5bc2653736281393271e50ba97f8558a /Lib/smtplib.py
parent63e4230c3865f6b15538b61fbecd5d0286b1f0a9 (diff)
downloadcpython-c1d520634a25fac5dea41f3af70273fc0b3a11ae.zip
cpython-c1d520634a25fac5dea41f3af70273fc0b3a11ae.tar.gz
cpython-c1d520634a25fac5dea41f3af70273fc0b3a11ae.tar.bz2
Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch by Kasun Herath.
Diffstat (limited to 'Lib/smtplib.py')
-rwxr-xr-xLib/smtplib.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index a01a184..2c2141b 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -219,6 +219,7 @@ class SMTP:
ehlo_msg = "ehlo"
ehlo_resp = None
does_esmtp = 0
+ default_port = SMTP_PORT
def __init__(self, host='', port=0, local_hostname=None,
timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
@@ -234,7 +235,6 @@ class SMTP:
"""
self.timeout = timeout
self.esmtp_features = {}
- self.default_port = SMTP_PORT
if host:
(code, msg) = self.connect(host, port)
if code != 220:
@@ -749,13 +749,15 @@ if _have_ssl:
are also optional - they can contain a PEM formatted private key and
certificate chain file for the SSL connection.
"""
+
+ default_port = SMTP_SSL_PORT
+
def __init__(self, host='', port=0, local_hostname=None,
keyfile=None, certfile=None,
timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
self.keyfile = keyfile
self.certfile = certfile
SMTP.__init__(self, host, port, local_hostname, timeout)
- self.default_port = SMTP_SSL_PORT
def _get_socket(self, host, port, timeout):
if self.debuglevel > 0: print('connect:', (host, port), file=stderr)