mirror of
https://github.com/python/cpython.git
synced 2025-07-07 11:25:30 +00:00
gh-135001: Explicitly specify the encoding parameter value of calendar.HTMLCalendar
as 'utf-8' (#135002)
This commit is contained in:
parent
aaad2e81ce
commit
f90483e13a
3 changed files with 5 additions and 5 deletions
|
@ -251,7 +251,7 @@ 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 the system default encoding).
|
||||
output (defaulting to ``'utf-8'``).
|
||||
|
||||
|
||||
.. method:: formatmonthname(theyear, themonth, withyear=True)
|
||||
|
|
|
@ -565,7 +565,7 @@ class HTMLCalendar(Calendar):
|
|||
Return a formatted year as a complete HTML page.
|
||||
"""
|
||||
if encoding is None:
|
||||
encoding = sys.getdefaultencoding()
|
||||
encoding = 'utf-8'
|
||||
v = []
|
||||
a = v.append
|
||||
a('<?xml version="1.0" encoding="%s"?>\n' % encoding)
|
||||
|
@ -846,7 +846,7 @@ def main(args=None):
|
|||
parser.add_argument(
|
||||
"-e", "--encoding",
|
||||
default=None,
|
||||
help="encoding to use for output"
|
||||
help="encoding to use for output (default utf-8)"
|
||||
)
|
||||
parser.add_argument(
|
||||
"-t", "--type",
|
||||
|
@ -890,7 +890,7 @@ def main(args=None):
|
|||
cal.setfirstweekday(options.first_weekday)
|
||||
encoding = options.encoding
|
||||
if encoding is None:
|
||||
encoding = sys.getdefaultencoding()
|
||||
encoding = 'utf-8'
|
||||
optdict = dict(encoding=encoding, css=options.css)
|
||||
write = sys.stdout.buffer.write
|
||||
if options.year is None:
|
||||
|
|
|
@ -417,7 +417,7 @@ class OutputTestCase(unittest.TestCase):
|
|||
self.check_htmlcalendar_encoding('utf-8', 'utf-8')
|
||||
|
||||
def test_output_htmlcalendar_encoding_default(self):
|
||||
self.check_htmlcalendar_encoding(None, sys.getdefaultencoding())
|
||||
self.check_htmlcalendar_encoding(None, 'utf-8')
|
||||
|
||||
def test_yeardatescalendar(self):
|
||||
def shrink(cal):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue