Merge pull request #4795 from mwichmann/issue/sphinx9-build

bdbaddog · web-flow · commit 0e2b56c9cc30 · 2025-12-03T10:27:14.000-08:00
Fix Sphinx build, again
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -25,6 +25,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       unknown argument ('explain') on creation, causing it to be considered
       an override. Also, if override dict is empty, don't even call the
       Override factory function.
+    - Handle the default (unset) ProgressObject differently for the sole
+      purpose of avoiding Sphinx 9.0+ blowing up on it (it's been giving
+      a warning for years, but now it's a fatal error).
 
 
 RELEASE 4.10.1 - Sun, 16 Nov 2025 10:51:57 -0700
diff --git a/RELEASE.txt b/RELEASE.txt
@@ -62,6 +62,11 @@ DOCUMENTATION
 
 - More clarifications in manpage Builder Methods section.
 
+- Handle the default (unset) ProgressObject differently for the sole
+  purpose of avoiding Sphinx 9.0+ blowing up on it (it's been giving
+  a warning for years, but now it's a fatal error). Affects only the
+  API doc build.
+
 
 DEVELOPMENT
 -----------
diff --git a/SCons/Script/Main.py b/SCons/Script/Main.py
@@ -178,7 +178,7 @@ def __call__(self, node) -> None:
                 self.erase_previous()
             self.func(node)
 
-ProgressObject = SCons.Util.Null()
+ProgressObject = None
 
 def Progress(*args, **kw) -> None:
     """Show progress during building - Public API."""
@@ -203,7 +203,7 @@ def display(self, message) -> None:
         display('scons: ' + message)
 
     def prepare(self):
-        if not isinstance(self.progress, SCons.Util.Null):
+        if self.progress is not None:
             for target in self.targets:
                 self.progress(target)
         return SCons.Taskmaster.OutOfDateTask.prepare(self)
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
@@ -144,7 +144,8 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#
+# html_static_path = ['_static']
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
