From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 7 Jun 2022 10:20:49 +0000 (-0700) Subject: gh-57539: Increase calendar test coverage (GH-93468) (GH-93565) X-Git-Tag: v3.10.6~189 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4fdd8ca298437943b08e82842325e3c7d814fbe;p=thirdparty%2FPython%2Fcpython.git gh-57539: Increase calendar test coverage (GH-93468) (GH-93565) (cherry picked from commit f0d0be3493fc5855eccfe0fbb3f25bf12760041f) Co-authored-by: Sean Fleming Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Co-authored-by: Łukasz Langa Co-authored-by: Hugo van Kemenade --- diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py index 5ae2b66ff3b5..dc49ac1c0f1e 100644 --- a/Lib/test/test_calendar.py +++ b/Lib/test/test_calendar.py @@ -564,6 +564,19 @@ class CalendarTestCase(unittest.TestCase): new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10) self.assertEqual(old_october, new_october) + def test_locale_calendar_formatweekday(self): + try: + # formatweekday uses different day names based on the available width. + cal = calendar.LocaleTextCalendar(locale='en_US') + # For short widths, a centered, abbreviated name is used. + self.assertEqual(cal.formatweekday(0, 5), " Mon ") + # For really short widths, even the abbreviated name is truncated. + self.assertEqual(cal.formatweekday(0, 2), "Mo") + # For long widths, the full day name is used. + self.assertEqual(cal.formatweekday(0, 10), " Monday ") + except locale.Error: + raise unittest.SkipTest('cannot set the en_US locale') + def test_locale_html_calendar_custom_css_class_month_name(self): try: cal = calendar.LocaleHTMLCalendar(locale='') diff --git a/Misc/ACKS b/Misc/ACKS index 7a363b99836a..c690200c15dd 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -545,6 +545,7 @@ Nils Fischbeck Frederik Fix Tom Flanagan Matt Fleming +Sean Fleming Hernán Martínez Foffani Benjamin Fogle Artem Fokin diff --git a/Misc/NEWS.d/next/Tests/2022-06-03-16-26-04.gh-issue-57539.HxWgYO.rst b/Misc/NEWS.d/next/Tests/2022-06-03-16-26-04.gh-issue-57539.HxWgYO.rst new file mode 100644 index 000000000000..0734b599f4ad --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2022-06-03-16-26-04.gh-issue-57539.HxWgYO.rst @@ -0,0 +1 @@ +Increase calendar test coverage for :meth:`calendar.LocaleTextCalendar.formatweekday`.