edit doc

Wulian233 · Wulian233 · commit debbe14ede64 · 2025-06-02T16:49:43.000+08:00
diff --git a/Doc/library/calendar.rst b/Doc/library/calendar.rst
@@ -251,10 +251,10 @@ interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
       3) specifies the number of months per row. *css* is the name for the
       cascading style sheet to be used. :const:`None` can be passed if no style
       sheet should be used. *encoding* specifies the encoding to be used for the
-      output (defaulting to ``utf-8``).
+      output (defaulting to ``'utf-8'``).
 
       .. versionchanged:: next
-         If *encoding* is None, utf-8 is used by default.
+         If *encoding* is None, ``'utf-8'`` is used by default.
 
    .. method:: formatmonthname(theyear, themonth, withyear=True)
 
@@ -654,10 +654,9 @@ The following options are accepted:
 
    The encoding to use for output.
    :option:`--encoding` is required if :option:`--locale` is set.
-   Defaults to None.
 
 .. versionchanged:: next
-   If *encoding* is None, utf-8 is used by default.
+   If no :option:`--encoding` is supplied, ``'utf-8'`` is used by default.
 
 .. option:: --type {text,html}, -t {text,html}
 
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
@@ -92,8 +92,8 @@ Improved modules
 calendar
 --------
 
-* The default *encoding* parameter value in :meth:`calendar.HTMLCalendar.formatyearpage`
-  is now utf-8.
+* The default *encoding* for `calendar.HTMLCalendar.formatyearpage` is ``'utf-8'``
+  Previously, it defaulted to :func:`sys.getdefaultencoding`.
   (Contributed by Jiahao Li in :gh:`135001`.)
 
 
@@ -261,9 +261,8 @@ New features
 Porting to Python 3.15
 ----------------------
 
-* The default *encoding* parameter value in :meth:`calendar.HTMLCalendar.formatyearpage`
-  is now utf-8.
-
+* The default *encoding* for `calendar.HTMLCalendar.formatyearpage` is now ``'utf-8'``.
+  Previously, it defaulted to :func:`sys.getdefaultencoding`.
   (Contributed by Jiahao Li in :gh:`135001`.)
 
 * :class:`sqlite3.Connection` APIs has been cleaned up.
diff --git a/Lib/calendar.py b/Lib/calendar.py
@@ -846,7 +846,7 @@ def main(args=None):
     parser.add_argument(
         "-e", "--encoding",
         default=None,
-        help="encoding to use for output (default utf-8)"
+        help="encoding to use for output (default: 'utf-8')"
     )
     parser.add_argument(
         "-t", "--type",
diff --git a/Misc/NEWS.d/next/Library/2025-06-01-19-45-55.gh-issue-135001.KsBXSl.rst b/Misc/NEWS.d/next/Library/2025-06-01-19-45-55.gh-issue-135001.KsBXSl.rst
@@ -1,2 +1 @@
-The default *encoding* parameter value in
-:meth:`calendar.HTMLCalendar.formatyearpage` is now utf-8.
+The default *encoding* for :meth:`calendar.HTMLCalendar.formatyearpage` is now ``'utf-8'``.

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ def main(args=None):`
`846`	`846`	`parser.add_argument(`
`847`	`847`	`"-e", "--encoding",`
`848`	`848`	`default=None,`
`849`		`- help="encoding to use for output (default utf-8)"`
	`849`	`+ help="encoding to use for output (default: 'utf-8')"`
`850`	`850`	`)`
`851`	`851`	`parser.add_argument(`
`852`	`852`	`"-t", "--type",`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-The default encoding parameter value in`
`2`		-:meth:`calendar.HTMLCalendar.formatyearpage` is now utf-8.
	`1`	+The default encoding for :meth:`calendar.HTMLCalendar.formatyearpage` is now ``'utf-8'``.