Fix calendar CLI when locale set via env var but not --locale

Author: hugovk

Lib/calendar.py

@@ -648,7 +648,7 @@ def formatmonthname(self, theyear, themonth, withyear=True):
             return super().formatmonthname(theyear, themonth, withyear)
 
 
-class _CLIDemoCalendar(LocaleTextCalendar):
+class _CLIDemoCalendar(TextCalendar):
     def __init__(self, highlight_day=None, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.highlight_day = highlight_day
@@ -752,6 +752,12 @@ def formatyear(self, theyear, w=2, l=1, c=6, m=3):
         return ''.join(v)
 
 
+class _CLIDemoLocaleCalendar(LocaleTextCalendar, _CLIDemoCalendar):
+    def __init__(self, highlight_day=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.highlight_day = highlight_day
+
+
 # Support for old module level interface
 c = TextCalendar()
 
@@ -893,7 +899,7 @@ def main(args=None):
             write(cal.formatyearpage(options.year, **optdict))
     else:
         if options.locale:
-            cal = _CLIDemoCalendar(highlight_day=today, locale=locale)
+            cal = _CLIDemoLocaleCalendar(highlight_day=today, locale=locale)
         else:
             cal = _CLIDemoCalendar(highlight_day=today)
         cal.setfirstweekday(options.first_weekday)