summaryrefslogtreecommitdiff
path: root/sphinx/ext/apidoc.py
diff options
context:
space:
mode:
authorStephen Finucane <stephen@that.guru>2017-10-01 14:45:41 +0100
committerStephen Finucane <stephen@that.guru>2017-10-02 15:42:23 +0100
commit1f5ed022252066900c4ed982184e3d26885ca33d (patch)
tree1f9773b98e0da2c6d50ffbae1057784056486e74 /sphinx/ext/apidoc.py
parent89f9c7cab74298a243ac409c26d25eb2b137bf03 (diff)
downloadsphinx-git-1f5ed022252066900c4ed982184e3d26885ca33d.tar.gz
sphinx-quickstart: Move code to 'sphinx.cmd'
We're going to move the executable's here (or at least those that part of the core library). The 'sphinx-build' executable was already moved, so lets do 'sphinx-quickstart' next. To avoid breaking packages that are using this feature directly, aliases for the old 'main' method are included. This is based on what Django does [1] and, like Django, will allow us to safely remove the old modules in Sphinx 2.0. [1] https://github.com/django/django/blob/1.11/django/test/runner.py#L688-L695 Signed-off-by: Stephen Finucane <stephen@that.guru>
Diffstat (limited to 'sphinx/ext/apidoc.py')
-rw-r--r--sphinx/ext/apidoc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/ext/apidoc.py b/sphinx/ext/apidoc.py
index 9061d801e..4a5c56850 100644
--- a/sphinx/ext/apidoc.py
+++ b/sphinx/ext/apidoc.py
@@ -25,7 +25,7 @@ from six import binary_type
from fnmatch import fnmatch
from sphinx import __display_version__
-from sphinx.quickstart import EXTENSIONS
+from sphinx.cmd.quickstart import EXTENSIONS
from sphinx.util import rst
from sphinx.util.osutil import FileAvoidWrite, walk
@@ -384,7 +384,7 @@ Note: By default this script will not overwrite already created files.""")
excludes = normalize_excludes(rootpath, excludes)
modules = recurse_tree(rootpath, excludes, opts)
if opts.full:
- from sphinx import quickstart as qs
+ from sphinx.cmd import quickstart as qs
modules.sort()
prev_module = '' # type: unicode
text = ''