lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: Fix the docs build with Sphinx 6.0

Browse Source 
commit 0283189e8f3d0917e2ac399688df85211f48447b upstream.

Sphinx 6.0 removed the execfile_() function, which we use as part of the
configuration process.  They *did* warn us...  Just open-code the
functionality as is done in Sphinx itself.

Tested (using SPHINX_CONF, since this code is only executed with an
alternative config file) on various Sphinx versions from 2.5 through 6.0.

Reported-by: Martin Liška <mliska@suse.cz>
Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jonathan Corbet 2023-01-04 10:47:39 -07:00 committed by Greg Kroah-Hartman
parent 3ed183074c
commit 2e4164d3d1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/sphinx/load_config.py
View File

@ -3,7 +3,7 @@
import os import os
import sys import sys
from sphinx.util.pycompat import execfile_ from sphinx.util.osutil import fs_encoding
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
def loadConfig(namespace): def loadConfig(namespace):
@ -48,7 +48,9 @@ def loadConfig(namespace):
sys.stdout.write("load additional sphinx-config: %s\n" % config_file) sys.stdout.write("load additional sphinx-config: %s\n" % config_file)
config = namespace.copy() config = namespace.copy()
config['__file__'] = config_file config['__file__'] = config_file
execfile_(config_file, config) with open(config_file, 'rb') as f:
code = compile(f.read(), fs_encoding, 'exec')
exec(code, config)
del config['__file__'] del config['__file__']
namespace.update(config) namespace.update(config)
else: else: