From: Hubert Badocha <badocha.hubert@gmail.com>
Date: Wed, 15 Sep 2021 20:36:38 +0000 (+0200)
Subject: bpo-39710: Remove Python 2-specific sentence from calendar documentation (GH-26985)
X-Git-Tag: v3.11.0a1~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a75a2577259a55d816de24a4cca16aad74e02aa5;p=thirdparty%2FPython%2Fcpython.git

bpo-39710: Remove Python 2-specific sentence from calendar documentation (GH-26985)
---

diff --git a/Doc/library/calendar.rst b/Doc/library/calendar.rst
index c3c04db853ed..6050ff5607a2 100644
--- a/Doc/library/calendar.rst
+++ b/Doc/library/calendar.rst
@@ -279,16 +279,13 @@ interpreted as prescribed by the ISO 8601 standard.  Year 0 is 1 BC, year -1 is
 
    This subclass of :class:`TextCalendar` can be passed a locale name in the
    constructor and will return month and weekday names in the specified locale.
-   If this locale includes an encoding all strings containing month and weekday
-   names will be returned as unicode.
 
 
 .. class:: LocaleHTMLCalendar(firstweekday=0, locale=None)
 
    This subclass of :class:`HTMLCalendar` can be passed a locale name in the
    constructor and will return month and weekday names in the specified
-   locale. If this locale includes an encoding all strings containing month and
-   weekday names will be returned as unicode.
+   locale.
 
 .. note::
 
diff --git a/Lib/calendar.py b/Lib/calendar.py
index 7311a0173729..663bb946b0d1 100644
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -558,9 +558,7 @@ class different_locale:
 class LocaleTextCalendar(TextCalendar):
     """
     This class can be passed a locale name in the constructor and will return
-    month and weekday names in the specified locale. If this locale includes
-    an encoding all strings containing month and weekday names will be returned
-    as unicode.
+    month and weekday names in the specified locale.
     """
 
     def __init__(self, firstweekday=0, locale=None):
@@ -581,9 +579,7 @@ class LocaleTextCalendar(TextCalendar):
 class LocaleHTMLCalendar(HTMLCalendar):
     """
     This class can be passed a locale name in the constructor and will return
-    month and weekday names in the specified locale. If this locale includes
-    an encoding all strings containing month and weekday names will be returned
-    as unicode.
+    month and weekday names in the specified locale.
     """
     def __init__(self, firstweekday=0, locale=None):
         HTMLCalendar.__init__(self, firstweekday)