From 616e48794153b4fe709f9545625e1b5f2cd1aed1 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 25 Feb 2018 01:10:36 +0900 Subject: [PATCH] Fix #4669: sphinx.build_main and sphinx.make_main throw NameError --- CHANGES | 2 ++ sphinx/__init__.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index d907eddb6..5a508b2aa 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,8 @@ Features added Bugs fixed ---------- +* #4669: sphinx.build_main and sphinx.make_main throw NameError + Testing -------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 4234f49cb..b819b1d5f 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -73,6 +73,7 @@ def main(*args, **kwargs): def build_main(argv=sys.argv): """Sphinx build "main" command-line entry.""" + from .cmd import build warnings.warn( '`sphinx.build_main()` has moved to `sphinx.cmd.build.build_main()`.', RemovedInSphinx20Warning, @@ -83,6 +84,7 @@ def build_main(argv=sys.argv): def make_main(argv=sys.argv): """Sphinx build "make mode" entry.""" + from .cmd import build warnings.warn( '`sphinx.build_main()` has moved to `sphinx.cmd.build.make_main()`.', RemovedInSphinx20Warning,