Skip to content

gh-73065: Add Date header if missing in smtplib send_message #136850

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

Open
Yoav11 wants to merge 18 commits into
base: main
Choose a base branch
from
Open

gh-73065: Add Date header if missing in smtplib send_message #136850

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
07f176c
bpo-28879: add Date header to send_message as per RFC5322
elafontaine Jan 13, 2018
433a2b3
rebase
ynir3 Jul 20, 2025
9f0cd3c
add patch
ynir3 Jul 20, 2025
cfa0e51
update blurb
ynir3 Jul 20, 2025
227baef
Merge branch 'main' into bpo-28879
Yoav11 Jul 20, 2025
c2945a8
Merge branch 'main' into bpo-28879
Yoav11 Jul 20, 2025
809c5fe
update rst
ynir3 Jul 20, 2025
5bca2a3
update rst
ynir3 Jul 20, 2025
d5d440d
update tests to not patch date
ynir3 Jul 20, 2025
f33a799
reorder assertions for readability
ynir3 Jul 20, 2025
25069ab
.
ynir3 Jul 20, 2025
3367490
use support.run_with_tz
ynir3 Jul 20, 2025
557b22b
remove empty line
ynir3 Jul 20, 2025
33b8e39
use 02 syntax
ynir3 Jul 20, 2025
7e56b09
Merge branch 'main' into bpo-28879
Yoav11 Jul 23, 2025
ecfba41
Merge remote-tracking branch 'origin/main' into bpo-28879
Yoav11 Sep 21, 2026
7b9af92
f-strings and date check
Yoav11 Sep 21, 2026
0dae44d
Trigger Read the Docs rebuild
Yoav11 Sep 23, 2026
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
f-strings and date check
  • Loading branch information
@Yoav11
Yoav11 committed Sep 21, 2026
commit 7b9af9236fb9c640d7c6159f6d600a37a8882e7c
2 changes: 1 addition & 1 deletion Lib/smtplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ def send_message(self, msg, from_addr=None, to_addrs=None,
raise ValueError("message has more than one 'Resent-' header block")

# RFC 5322 section 3.6, 4th Paragraph
if msg.get('Date', None) is None:
if 'Date' not in msg:
# localtime: RFC 5322 section 3.3, 4th Paragraph
msg['Date'] = email.utils.formatdate(localtime=True)
if from_addr is None:
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_smtplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,17 +1529,17 @@ def test_send_message_uses_smtputf8_if_addrs_non_ascii(self):
"UTC+02:00"
)
Comment thread
Yoav11 marked this conversation as resolved.

expected = textwrap.dedent("""\
expected = textwrap.dedent(f"""\
From: Páolo <főo@bar.com>
To: Dinsdale
Subject: Nudge nudge, wink, wink \u1F609
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
Date: {}
Date: {date}

oh là là, know what I mean, know what I mean?
""".format(date))
""")

self.assertEqual(self.serv.last_mailfrom, 'főo@bar.com')
self.assertEqual(self.serv.last_rcpttos, ['Dinsdale'])
Expand Down
Loading