fix

python · vstinner · Jun 9, 2025 · Jun 1, 2025 · Jun 6, 2025 · Jun 6, 2025
commit a232d70183f1f0c500b5cfc15704f379138b721f
diff --git a/Doc/library/calendar.rst b/Doc/library/calendar.rst
@@ -245,16 +245,13 @@ interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
       specifies the number of months per row.
 
 
-   .. method:: formatyearpage(theyear, width=3, css='calendar.css', encoding='utf-8')
+   .. method:: formatyearpage(theyear, width=3, css='calendar.css', encoding=None)
 
       Return a year's calendar as a complete HTML page. *width* (defaulting to
       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``).
-
-      .. versionchanged:: next
-         The default value of the *encoding* has been changed to utf-8.
+      output (defaulting to ``'utf-8'``).
 
    .. method:: formatmonthname(theyear, themonth, withyear=True)
 
@@ -653,10 +650,7 @@ The following options are accepted:
 .. option:: --encoding ENCODING, -e ENCODING
 
    The encoding to use for output.
-   Defaults to utf-8.
-
-.. versionchanged:: next
-   The default value has been changed to utf-8.
+   :option:`--encoding` is required if :option:`--locale` is set.
 
 .. option:: --type {text,html}, -t {text,html}
 

diff --git a/Lib/calendar.py b/Lib/calendar.py
@@ -560,10 +560,12 @@ def formatyear(self, theyear, width=3):
         a('</table>')
         return ''.join(v)
 
-    def formatyearpage(self, theyear, width=3, css='calendar.css', encoding='utf-8'):
+    def formatyearpage(self, theyear, width=3, css='calendar.css', encoding=None):
         """
         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)
@@ -843,7 +845,7 @@ def main(args=None):
     )
     parser.add_argument(
         "-e", "--encoding",
-        default="utf-8",
+        default=None,
         help="encoding to use for output (default utf-8)"
     )
     parser.add_argument(
@@ -870,6 +872,10 @@ def main(args=None):
 
     options = parser.parse_args(args)
 
+    if options.locale and not options.encoding:
+        parser.error("if --locale is specified --encoding is required")
+        sys.exit(1)
+
     locale = options.locale, options.encoding
     today = datetime.date.today()
 
@@ -883,6 +889,8 @@ def main(args=None):
             cal = HTMLCalendar()
         cal.setfirstweekday(options.first_weekday)
         encoding = options.encoding
+        if encoding is None:
+            encoding = 'utf-8'
         optdict = dict(encoding=encoding, css=options.css)
         write = sys.stdout.buffer.write
         if options.year is None:

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
diff --git a/Misc/NEWS.d/next/Library/2025-06-06-09-20-46.gh-issue-135001.zotIVz.rst b/Misc/NEWS.d/next/Library/2025-06-06-09-20-46.gh-issue-135001.zotIVz.rst
@@ -0,0 +1,3 @@
+Replace *encoding* parameter value in
+:meth:`calendar.HTMLCalendar.formatyearpage` from
+:func:`sys.getdefaultencoding()` to ``utf-8``.