Refactor out html page

pgdr · hugovk · web-flow · commit f54f75799e79 · 2025-10-22T11:48:05.000+02:00
Contributed by hugovk

Co-authored-by: Hugo van Kemenade &lt;1324225+hugovk@users.noreply.github.com&gt;
diff --git a/Lib/calendar.py b/Lib/calendar.py
@@ -603,9 +603,9 @@ def formatyearpage(self, theyear, width=3, css='calendar.css', encoding=None):
         return ''.join(v).encode(encoding, "xmlcharrefreplace")
 
 
-    def formatmonthpage(self, theyear, themonth, width=3, css='calendar.css', encoding=None):
+    def _format_html_page(self, theyear, content, css, encoding):
         """
-        Return a formatted month as a complete HTML page.
+        Return a complete HTML page with the given content.
         """
         if encoding is None:
             encoding = 'utf-8'
@@ -626,11 +626,25 @@ def formatmonthpage(self, theyear, themonth, width=3, css='calendar.css', encodi
             a(f'<link rel="stylesheet" href="{css}">\n')
         a('</head>\n')
         a('<body>\n')
-        a(self.formatmonth(theyear, themonth, width))
+        a(content)
         a('</body>\n')
         a('</html>\n')
         return ''.join(v).encode(encoding, "xmlcharrefreplace")
 
+    def formatyearpage(self, theyear, width=3, css='calendar.css', encoding=None):
+        """
+        Return a formatted year as a complete HTML page.
+        """
+        content = self.formatyear(theyear, width)
+        return self._format_html_page(theyear, content, css, encoding)
+
+    def formatmonthpage(self, theyear, themonth, width=3, css='calendar.css', encoding=None):
+        """
+        Return a formatted month as a complete HTML page.
+        """
+        content = self.formatmonth(theyear, themonth, width)
+        return self._format_html_page(theyear, content, css, encoding)
+
 
 class different_locale:
     def __init__(self, locale):
