Skip to content

gh-70039: smtplib: store the server name in ._host in .connect() #115259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bitdancer merged 8 commits into from
Apr 8, 2026
Merged

gh-70039: smtplib: store the server name in ._host in .connect() #115259

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e35ead
smtplib: store the server name in ._host in .connect()
nmartensen Feb 10, 2024
699384f
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 10, 2024
5ea81fc
move and rename tests
nmartensen Feb 19, 2024
75f4265
Drop test_smtplib tests again
nmartensen Dec 23, 2025
8810ffb
Revised NEWS entry
nmartensen Dec 23, 2025
eb2b520
add missing backticks to NEWS message
nmartensen Dec 23, 2025
ffa8e28
Merge branch 'main' into 70039_smtplib_host_port
nmartensen Dec 23, 2025
0035585
NEWS entry: add missing smtplib context
nmartensen Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move and rename tests
  • Loading branch information
@nmartensen
nmartensen committed Feb 19, 2024
commit 5ea81fce9ee1095b25311eef460848688afce5fc
54 changes: 28 additions & 26 deletions Lib/test/test_smtplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,32 +158,6 @@ def test_debuglevel_2(self):
re.MULTILINE)
self.assertRegex(stderr.getvalue(), expected)

def test_host_port_host(self):
mock_socket.reply_with(b"220 Hello world")
# create instance without arguments
smtp = smtplib.SMTP(f"{HOST}:{self.port}")
# .connect must set ._host since it is used by .starttls
self.assertEqual(smtp._host, HOST)
smtp.close()

def test_explicit_connect(self):
mock_socket.reply_with(b"220 Hello world")
# create instance without arguments
smtp = smtplib.SMTP()
# .connect must set ._host since it is used by .starttls
smtp.connect(HOST, self.port)
self.assertEqual(smtp._host, HOST)
smtp.close()

def test_explicit_connect_host_port(self):
mock_socket.reply_with(b"220 Hello world")
# create instance without arguments
smtp = smtplib.SMTP()
# .connect must set ._host since it is used by .starttls
smtp.connect(f"{HOST}:{self.port}")
self.assertEqual(smtp._host, HOST)
smtp.close()


class SMTPGeneralTests(GeneralTests, unittest.TestCase):

Expand Down Expand Up @@ -308,6 +282,34 @@ def testBasic(self):
# connect
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost',
timeout=support.LOOPBACK_TIMEOUT)
# implicit .connect must set ._host since it is used by .starttls
self.assertEqual(smtp._host, HOST)
smtp.quit()

def test_host_port_host(self):
# create instance with host:port notation
smtp = smtplib.SMTP(f"{HOST}:{self.port}", local_hostname='localhost',
timeout=support.LOOPBACK_TIMEOUT)
# implicit .connect must set ._host since it is used by .starttls
self.assertEqual(smtp._host, HOST)
smtp.quit()

def test_explicit_connect(self):
# create instance without arguments
smtp = smtplib.SMTP(local_hostname='localhost',
timeout=support.LOOPBACK_TIMEOUT)
# explicit .connect must set ._host since it is used by .starttls
smtp.connect(HOST, self.port)
self.assertEqual(smtp._host, HOST)
smtp.quit()

def test_explicit_connect_host_port(self):
# create instance without arguments
smtp = smtplib.SMTP(local_hostname='localhost',
timeout=support.LOOPBACK_TIMEOUT)
# explicit .connect with host:port notation must set ._host, too
smtp.connect(f"{HOST}:{self.port}")
self.assertEqual(smtp._host, HOST)
Comment thread
bitdancer marked this conversation as resolved.
Outdated
smtp.quit()

def testSourceAddress(self):
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_smtpnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_connect_starttls(self):
server.ehlo()
server.quit()

def test_connect2_starttls(self):
def test_connect_host_port_starttls(self):
support.get_attribute(smtplib, 'SMTP_SSL')
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
context.check_hostname = False
Expand All @@ -59,7 +59,7 @@ def test_connect2_starttls(self):
server.ehlo()
server.quit()

def test_connect3_starttls(self):
def test_explicit_connect_starttls(self):
support.get_attribute(smtplib, 'SMTP_SSL')
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
context.check_hostname = False
Expand All @@ -77,7 +77,7 @@ def test_connect3_starttls(self):
server.ehlo()
server.quit()

def test_connect4_starttls(self):
def test_explicit_connect_host_port_starttls(self):
support.get_attribute(smtplib, 'SMTP_SSL')
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
context.check_hostname = False
Expand Down
Loading