diff --git a/CHANGES b/CHANGES index 2c4f1aa91..e217f5b90 100644 --- a/CHANGES +++ b/CHANGES @@ -34,6 +34,9 @@ Bugs fixed * #5070: epub: Wrong internal href fragment links * #5104: apidoc: Interface of ``sphinx.apidoc:main()`` has changed * #5076: napoleon raises RuntimeError with python 3.7 +* #5125: sphinx-build: Interface of ``sphinx:main()`` has changed +* sphinx-build: ``sphinx.cmd.build.main()`` refers ``sys.argv`` instead of given + argument Testing -------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index c81166603..34bd365bc 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -60,15 +60,15 @@ if __version__.endswith('+'): pass -def main(*args, **kwargs): +def main(argv=sys.argv): from .cmd import build warnings.warn( '`sphinx.main()` has moved to `sphinx.cmd.build.main()`.', RemovedInSphinx20Warning, stacklevel=2, ) - args = args[1:] # skip first argument to adjust arguments (refs: #4615) - return build.main(*args, **kwargs) + argv = argv[1:] # skip first argument to adjust arguments (refs: #4615) + return build.main(argv) def build_main(argv=sys.argv): diff --git a/sphinx/cmd/build.py b/sphinx/cmd/build.py index c0c31ae67..1add951ca 100644 --- a/sphinx/cmd/build.py +++ b/sphinx/cmd/build.py @@ -32,7 +32,7 @@ def make_main(argv=sys.argv[1:]): def main(argv=sys.argv[1:]): # type: (List[str]) -> int - if sys.argv[1:2] == ['-M']: + if argv[:1] == ['-M']: return make_main(argv) else: return build_main(argv)