WIP: Fix doc

Author: Wulian233

Doc/whatsnew/3.15.rst

@@ -89,6 +89,13 @@ New modules
 Improved modules
 ================
 
+calendar
+--------
+
+* The default *encoding* parameter value in :meth:`calendar.HTMLCalendar.formatyearpage`
+  is now utf-8.
+  (Contributed by Jiahao Li in :gh:`135001`.)
+
 difflib
 -------
 
@@ -138,13 +145,6 @@ Deprecated
 Removed
 =======
 
-calendar
---------
-
-* The default *encoding* parameter value in :meth:`calendar.HTMLCalendar.formatyearpage`
-  is now utf-8.
-  (Contributed by Jiahao Li in :gh:`135001`.)
-
 ctypes
 ------
 
@@ -243,6 +243,11 @@ New features
 Porting to Python 3.15
 ----------------------
 
+* The default *encoding* parameter value in :meth:`calendar.HTMLCalendar.formatyearpage`
+  is now utf-8.
+
+  (Contributed by Jiahao Li in :gh:`135001`.)
+
 * :class:`sqlite3.Connection` APIs has been cleaned up.
 
   * All parameters of :func:`sqlite3.connect` except *database* are now keyword-only.

Lib/calendar.py

@@ -564,6 +564,8 @@ def formatyearpage(self, theyear, width=3, css='calendar.css', encoding='utf-8')
         """
         Return a formatted year as a complete HTML page.
         """
+        if encoding is None:
+            encoding = 'utf-8'
         v = []
         a = v.append
         a('<?xml version="1.0" encoding="%s"?>\n' % encoding)

Lib/test/test_calendar.py

@@ -413,11 +413,8 @@ def test_output_textcalendar(self):
     def test_output_htmlcalendar_encoding_ascii(self):
         self.check_htmlcalendar_encoding('ascii', 'ascii')
 
-    def test_output_htmlcalendar_encoding_utf8(self):
-        self.check_htmlcalendar_encoding('utf-8', 'utf-8')
-
-    def test_output_htmlcalendar_encoding_default(self):
-        self.check_htmlcalendar_encoding(None, sys.getdefaultencoding())
+    def test_output_htmlcalendar_encoding_none(self):
+        self.check_htmlcalendar_encoding(None, 'utf-8')
 
     def test_yeardatescalendar(self):
         def shrink(cal):