Fix minor compatibility issues with Sphinx 7 (#271)

jbms · Jul 19, 2023 · dff3a58 · dff3a58
1 parent 0b6232b
commit dff3a58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/sphinx_immaterial/apidoc/python/style_default_values_as_code.py b/sphinx_immaterial/apidoc/python/style_default_values_as_code.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
 import docutils.nodes
 import sphinx.domains.python
 import sphinx.environment
@@ -12,9 +10,9 @@ def _monkey_patch_python_parse_arglist():
     orig_parse_arglist = sphinx.domains.python._parse_arglist
 
     def parse_arglist(
-        arglist: str, env: Optional[sphinx.environment.BuildEnvironment] = None
+        arglist: str, *args, **kwargs
     ) -> sphinx.addnodes.desc_parameterlist:
-        result = orig_parse_arglist(arglist, env)
+        result = orig_parse_arglist(arglist, *args, **kwargs)
         for node in result.findall(condition=docutils.nodes.inline):
             if "default_value" not in node["classes"]:
                 continue

diff --git a/sphinx_immaterial/graphviz.py b/sphinx_immaterial/graphviz.py
@@ -422,13 +422,14 @@ def _replace_var_refs_with_defaults(code: str) -> str:
     return code
 
 
-def on_build_finished(app: sphinx.application.Sphinx, exc: Optional[Exception]) -> None:
+def on_build_finished(*args, **kwargs) -> None:
     # Suppress inclusion of the graphviz.css file supplied by
     # `sphinx.ext.graphviz`.  This theme provides its own style rules.
     pass
 
 
-sphinx.ext.graphviz.on_build_finished = on_build_finished
+sphinx.ext.graphviz.on_config_inited = on_build_finished  # type: ignore[attr-defined]
+sphinx.ext.graphviz.on_build_finished = on_build_finished  # type: ignore[attr-defined]
 
 
 def _preprocess_graphviz_node(