mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-02-20 11:45:48 +08:00
9a633e2ef1
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>
35 lines
1.4 KiB
Python
35 lines
1.4 KiB
Python
# -*- coding: utf-8; mode: python -*-
|
|
# pylint: disable=R0903, C0330, R0914, R0912, E0401
|
|
|
|
import os
|
|
import sys
|
|
from sphinx.util.osutil import fs_encoding
|
|
|
|
# ------------------------------------------------------------------------------
|
|
def loadConfig(namespace):
|
|
# ------------------------------------------------------------------------------
|
|
|
|
u"""Load an additional configuration file into *namespace*.
|
|
|
|
The name of the configuration file is taken from the environment
|
|
``SPHINX_CONF``. The external configuration file extends (or overwrites) the
|
|
configuration values from the origin ``conf.py``. With this you are able to
|
|
maintain *build themes*. """
|
|
|
|
config_file = os.environ.get("SPHINX_CONF", None)
|
|
if (config_file is not None
|
|
and os.path.normpath(namespace["__file__"]) != os.path.normpath(config_file) ):
|
|
config_file = os.path.abspath(config_file)
|
|
|
|
if os.path.isfile(config_file):
|
|
sys.stdout.write("load additional sphinx-config: %s\n" % config_file)
|
|
config = namespace.copy()
|
|
config['__file__'] = config_file
|
|
with open(config_file, 'rb') as f:
|
|
code = compile(f.read(), fs_encoding, 'exec')
|
|
exec(code, config)
|
|
del config['__file__']
|
|
namespace.update(config)
|
|
else:
|
|
sys.stderr.write("WARNING: additional sphinx-config not found: %s\n" % config_file)
|