Use _StrPath in HTMLBuilder (#13045)

sphinx/builders/_epub_base.py

@@ -24,6 +24,8 @@
 from sphinx.util.osutil import copyfile, ensuredir, relpath
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     from docutils.nodes import Element, Node
 
 try:
@@ -487,7 +489,8 @@ def handle_page(
         pagename: str,
         addctx: dict[str, Any],
         templatename: str = 'page.html',
-        outfilename: str | None = None,
+        *,
+        outfilename: Path | None = None,
         event_arg: Any = None,
     ) -> None:
         """Create a rendered page.
@@ -500,7 +503,9 @@ def handle_page(
                 return
             self.fix_genindex(addctx['genindexentries'])
         addctx['doctype'] = self.doctype
-        super().handle_page(pagename, addctx, templatename, outfilename, event_arg)
+        super().handle_page(
+            pagename, addctx, templatename, outfilename=outfilename, event_arg=event_arg
+        )
 
     def build_mimetype(self) -> None:
         """Write the metainfo file mimetype."""

sphinx/builders/dirhtml.py

@@ -2,12 +2,12 @@
 
 from __future__ import annotations
 
-from os import path
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 from sphinx.builders.html import StandaloneHTMLBuilder
 from sphinx.util import logging
-from sphinx.util.osutil import SEP, os_path
+from sphinx.util.osutil import SEP
 
 if TYPE_CHECKING:
     from sphinx.application import Sphinx
@@ -32,15 +32,11 @@ def get_target_uri(self, docname: str, typ: str | None = None) -> str:
             return docname[:-5]  # up to sep
         return docname + SEP
 
-    def get_outfilename(self, pagename: str) -> str:
-        if pagename == 'index' or pagename.endswith(SEP + 'index'):
-            outfilename = path.join(self.outdir, os_path(pagename) + self.out_suffix)
-        else:
-            outfilename = path.join(
-                self.outdir, os_path(pagename), 'index' + self.out_suffix
-            )
-
-        return outfilename
+    def get_output_path(self, page_name: str, /) -> Path:
+        page_parts = page_name.split(SEP)
+        if page_parts[-1] == 'index':
+            page_parts.pop()
+        return Path(self.outdir, *page_parts, f'index{self.out_suffix}')
 
 
 def setup(app: Sphinx) -> ExtensionMetadata: