From 7225e4032a3ea4ea3ecdd8b402e817b818b6b69f Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Sat, 20 Jul 2024 18:47:07 +0100
Subject: [PATCH] Remove deprecated functions in ``sphinx.util.osutil``

---
 CHANGES.rst           |  3 +++
 sphinx/util/osutil.py | 10 ++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c87d2b20c..4733a2809 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -33,6 +33,9 @@ Incompatible changes
     (use ``sphinx.builders.epub3._XML_NAME_PATTERN``).
 
   Patch by Adam Turner.
+* Removed :py:func:`!sphinx.util.osutil.cd`
+  (use :py:func:`contextlib.chdir`).
+  Patch by Adam Turner.
 
 Deprecated
 ----------
diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index c5a856b22..ea49e82cf 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -13,8 +13,6 @@ from io import StringIO
 from os import path
 from typing import TYPE_CHECKING
 
-from sphinx.deprecation import _deprecation_warning
-
 if TYPE_CHECKING:
     from collections.abc import Iterator
     from pathlib import Path
@@ -183,12 +181,8 @@ class _chdir:
         os.chdir(self._dirs.pop())
 
 
-@contextlib.contextmanager
-def cd(target_dir: str) -> Iterator[None]:
-    if sys.version_info[:2] >= (3, 11):
-        _deprecation_warning(__name__, 'cd', 'contextlib.chdir', remove=(8, 0))
-    with _chdir(target_dir):
-        yield
+if sys.version_info[:2] < (3, 11):
+    cd = _chdir
 
 
 class FileAvoidWrite: