Use type hints for directories

Author: AA-Turner

sphinx/builders/__init__.py

@@ -48,6 +48,7 @@
     from sphinx.application import Sphinx
     from sphinx.config import Config
     from sphinx.events import EventManager
+    from sphinx.util._pathlib import _StrPath
     from sphinx.util.tags import Tags
 
 
@@ -94,10 +95,10 @@ class Builder:
     supported_data_uri_images: bool = False
 
     def __init__(self, app: Sphinx, env: BuildEnvironment) -> None:
-        self.srcdir = app.srcdir
-        self.confdir = app.confdir
-        self.outdir = app.outdir
-        self.doctreedir = app.doctreedir
+        self.srcdir: _StrPath = app.srcdir
+        self.confdir: _StrPath = app.confdir
+        self.outdir: _StrPath = app.outdir
+        self.doctreedir: _StrPath = app.doctreedir
         ensuredir(self.doctreedir)
 
         self.app: Sphinx = app

sphinx/environment/__init__.py

@@ -32,7 +32,6 @@
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterable, Iterator
-    from pathlib import Path
     from typing import Any, Literal
 
     from docutils import nodes
@@ -102,8 +101,8 @@ class BuildEnvironment:
 
     def __init__(self, app: Sphinx) -> None:
         self.app: Sphinx = app
-        self.doctreedir: Path = app.doctreedir
-        self.srcdir: Path = app.srcdir
+        self.doctreedir: _StrPath = app.doctreedir
+        self.srcdir: _StrPath = app.srcdir
         self.config: Config = None  # type: ignore[assignment]
         self.config_status: int = CONFIG_UNSET
         self.config_status_extra: str = ''

sphinx/writers/html5.py

@@ -752,7 +752,7 @@ def visit_image(self, node: Element) -> None:
             # but it tries the final file name, which does not necessarily exist
             # yet at the time the HTML file is written.
             if not ('width' in node and 'height' in node):
-                path = os.path.join(self.builder.srcdir, olduri)  # type: ignore[has-type]
+                path = os.path.join(self.builder.srcdir, olduri)
                 size = get_image_size(path)
                 if size is None:
                     logger.warning(