From 5ce8a9ae5613505cae629aa9e2a32ba2af74efb2 Mon Sep 17 00:00:00 2001
From: Wulian233 <1055917385@qq.com>
Date: Mon, 11 Aug 2025 14:47:13 +0800
Subject: [PATCH 1/3] Modernizing `calendar.HTMLCalendar` for HTML Output
---
Doc/whatsnew/3.15.rst | 7 +++
Lib/calendar.py | 44 +++++++-------
Lib/test/test_calendar.py | 60 +++++++++++--------
...-08-11-14-18-32.gh-issue-137634.M7iBG6.rst | 2 +
4 files changed, 68 insertions(+), 45 deletions(-)
create mode 100644 Misc/NEWS.d/next/Library/2025-08-11-14-18-32.gh-issue-137634.M7iBG6.rst
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
index 9f01b52f1aff3b..3adf1925925942 100644
--- a/Doc/whatsnew/3.15.rst
+++ b/Doc/whatsnew/3.15.rst
@@ -214,6 +214,13 @@ New modules
Improved modules
================
+calendar
+--------
+
+* Calendar pages generated by the :class:`calendar.HTMLCalendar` class now support
+ dark mode, and migrated the output to the HTML5 standard.
+ (Contributed by Jiahao Li in :gh:`137634`.)
+
dbm
---
diff --git a/Lib/calendar.py b/Lib/calendar.py
index 45bb265a65602c..dd59de1f337569 100644
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -490,30 +490,29 @@ def formatday(self, day, weekday):
"""
if day == 0:
# day outside month
- return '
' % self.cssclass_noday
+ return f'
'
else:
- return '
%d
' % (self.cssclasses[weekday], day)
+ return f'
{day}
'
def formatweek(self, theweek):
"""
Return a complete week as a table row.
"""
s = ''.join(self.formatday(d, wd) for (d, wd) in theweek)
- return '
%s
' % s
+ return f'
{s}
'
def formatweekday(self, day):
"""
Return a weekday name as a table header.
"""
- return '
%s
' % (
- self.cssclasses_weekday_head[day], day_abbr[day])
+ return f'
{day_abbr[day]}
'
def formatweekheader(self):
"""
Return a header for a week as a table row.
"""
s = ''.join(self.formatweekday(i) for i in self.iterweekdays())
- return '
%s
' % s
+ return f'
{s}
'
def formatmonthname(self, theyear, themonth, withyear=True):
"""
@@ -521,11 +520,10 @@ def formatmonthname(self, theyear, themonth, withyear=True):
"""
_validate_month(themonth)
if withyear:
- s = '%s %s' % (standalone_month_name[themonth], theyear)
+ s = f'{standalone_month_name[themonth]} {theyear}'
else:
s = standalone_month_name[themonth]
- return '