leave the None

Author: Wulian233

Doc/library/calendar.rst

@@ -245,7 +245,7 @@ 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
@@ -254,7 +254,7 @@ interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
       output (defaulting to ``utf-8``).
 
       .. versionchanged:: next
-         The default value of the *encoding* has been changed to utf-8.
+         If *encoding* is None, utf-8 is used by default.
 
    .. method:: formatmonthname(theyear, themonth, withyear=True)
 
@@ -653,10 +653,11 @@ The following options are accepted:
 .. option:: --encoding ENCODING, -e ENCODING
 
    The encoding to use for output.
-   Defaults to utf-8.
+   :option:`--encoding` is required if :option:`--locale` is set.
+   Defaults to None.
 
 .. versionchanged:: next
-   The default value has been changed to utf-8.
+   If *encoding* is None, utf-8 is used by default.
 
 .. option:: --type {text,html}, -t {text,html}
 

Lib/calendar.py

@@ -560,7 +560,7 @@ 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.
         """
@@ -845,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(
@@ -872,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()
 

Lib/test/test_calendar.py

@@ -7,6 +7,7 @@
 import datetime
 import io
 import locale
+import os
 import sys
 import time
 
@@ -928,7 +929,7 @@ def test_several_leapyears_in_range(self):
 
 
 def conv(s):
-    return s.encode()
+    return s.replace('\n', os.linesep).encode()
 
 class CommandLineTestCase(unittest.TestCase):
     def setUp(self):
@@ -1034,6 +1035,7 @@ def test_option_encoding(self):
     def test_option_locale(self):
         self.assertFailure('-L')
         self.assertFailure('--locale')
+        self.assertFailure('-L', 'en')
 
         lang, enc = locale.getlocale()
         lang = lang or 'C'
@@ -1067,7 +1069,7 @@ def test_option_lines(self):
         self.assertFailure('-l', 'spam')
         for run in self.runners:
             output = run('--lines', '2', '2004')
-            self.assertRegex(output, br'December(\r\n|\n){2}Mo Tu We')
+            self.assertIn(conv('December\n\nMo Tu We'), output)
 
     def test_option_spacing(self):
         self.assertFailure('-s')
@@ -1083,7 +1085,7 @@ def test_option_months(self):
         self.assertFailure('-m', 'spam')
         for run in self.runners:
             output = run('--months', '1', '2004')
-            self.assertRegex(output, br'(\r\n|\n)Mo Tu We Th Fr Sa Su(\r\n|\n)')
+            self.assertIn(conv('\nMo Tu We Th Fr Sa Su\n'), output)
 
     def test_option_type(self):
         self.assertFailure('-t')