From: Dominic Davis-Foster <dominic@davis-foster.co.uk>
Date: Mon, 2 Jun 2025 20:13:40 +0100
Subject: Fix compatibility with newer sphinx-autodoc-typehints

(cherry picked from commit 24280503ea0f518551bee980432dfef2164d412a)
---
 sphinx_toolbox/more_autodoc/typehints.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sphinx_toolbox/more_autodoc/typehints.py b/sphinx_toolbox/more_autodoc/typehints.py
index 17acd23..2b0a499 100644
--- a/sphinx_toolbox/more_autodoc/typehints.py
+++ b/sphinx_toolbox/more_autodoc/typehints.py
@@ -182,6 +182,9 @@ except ImportError:
 	from sphinx_autodoc_typehints import _LOGGER as sat_logger
 	from sphinx_autodoc_typehints import _PYDATA_ANNOTATIONS as pydata_annotations
 
+if isinstance(next(iter(pydata_annotations)), tuple):
+	pydata_annotations = {x[1] for x in pydata_annotations}
+
 try:
 	# 3rd party
 	from sphinx_autodoc_typehints import _future_annotations_imported