Fix #4615: The argument of `sphinx.build` has been changed in 1.7.0

This commit is contained in:
Takeshi KOMIYA 2018-02-16 01:52:51 +09:00
parent 911f74f467
commit b5bae235f2
4 changed files with 8 additions and 4 deletions

View File

@ -23,6 +23,7 @@ Bugs fixed
* #4260: autodoc: keyword only argument separator is not disappeared if it is
appeared at top of the argument list
* #4623: sphinx.build_main no longer exists in 1.7.0
* #4615: The argument of ``sphinx.build`` has been changed in 1.7.0
Testing
--------

View File

@ -67,27 +67,28 @@ def main(*args, **kwargs):
RemovedInSphinx20Warning,
stacklevel=2,
)
args = args[1:] # skip first argument to adjust arguments (refs: #4615)
return build.main(*args, **kwargs)
def build_main(argv=sys.argv[1:]):
def build_main(argv=sys.argv):
"""Sphinx build "main" command-line entry."""
warnings.warn(
'`sphinx.build_main()` has moved to `sphinx.cmd.build.build_main()`.',
RemovedInSphinx20Warning,
stacklevel=2,
)
return build.build_main(argv)
return build.build_main(argv[1:]) # skip first argument to adjust arguments (refs: #4615)
def make_main(argv=sys.argv[1:]):
def make_main(argv=sys.argv):
"""Sphinx build "make mode" entry."""
warnings.warn(
'`sphinx.build_main()` has moved to `sphinx.cmd.build.make_main()`.',
RemovedInSphinx20Warning,
stacklevel=2,
)
return build.make_main(argv)
return build.make_main(argv[1:]) # skip first argument to adjust arguments (refs: #4615)
if __name__ == '__main__':

View File

@ -21,6 +21,7 @@ def main(*args, **kwargs):
RemovedInSphinx20Warning,
stacklevel=2,
)
args = args[1:] # skip first argument to adjust arguments (refs: #4615)
_main(*args, **kwargs)

View File

@ -22,6 +22,7 @@ def main(*args, **kwargs):
RemovedInSphinx20Warning,
stacklevel=2,
)
args = args[1:] # skip first argument to adjust arguments (refs: #4615)
_main(*args, **kwargs)