Finish: pass test!

Author: Wulian233

Lib/calendar.py

@@ -885,6 +885,8 @@ def main(args=None):
             cal = HTMLCalendar()
         cal.setfirstweekday(options.first_weekday)
         encoding = options.encoding
+        if encoding is None:
+            encoding = sys.getdefaultencoding()
         optdict = dict(encoding=encoding, css=options.css)
         write = sys.stdout.buffer.write
         if options.year is None:

Lib/test/test_calendar.py

@@ -929,7 +929,7 @@ def test_several_leapyears_in_range(self):
 
 
 def conv(s):
-    return s.replace('\n', os.linesep).encode()
+    return s.encode()
 
 class CommandLineTestCase(unittest.TestCase):
     def setUp(self):
@@ -1035,7 +1035,6 @@ 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'
@@ -1069,7 +1068,7 @@ def test_option_lines(self):
         self.assertFailure('-l', 'spam')
         for run in self.runners:
             output = run('--lines', '2', '2004')
-            self.assertIn(conv('December\n\nMo Tu We'), output)
+            self.assertRegex(output, br'December(\r\n|\n){2}Mo Tu We')
 
     def test_option_spacing(self):
         self.assertFailure('-s')
@@ -1085,7 +1084,7 @@ def test_option_months(self):
         self.assertFailure('-m', 'spam')
         for run in self.runners:
             output = run('--months', '1', '2004')
-            self.assertIn(conv('\nMo Tu We Th Fr Sa Su\n'), output)
+            self.assertRegex(output, br'(\r\n|\n)Mo Tu We Th Fr Sa Su(\r\n|\n)')
 
     def test_option_type(self):
         self.assertFailure('-t')