diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-11-11 20:50:43 +0300 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-11-11 20:50:43 +0300 |
| commit | 279e547860ea68e3c357f55e608afec682a1f961 (patch) | |
| tree | dc08e85ab0210538e30b5b801bf9d80ab49bfb3f /sphinx/cmd | |
| parent | 859b5fcea71f8d4f46e0ef3726e68df54bfbc3b7 (diff) | |
| parent | 64fb1e56242d93ee0e8c317ab9e7643242b99658 (diff) | |
Merge branch '3.x'
Diffstat (limited to 'sphinx/cmd')
| -rw-r--r-- | sphinx/cmd/build.py | 4 | ||||
| -rw-r--r-- | sphinx/cmd/make_mode.py | 3 | ||||
| -rw-r--r-- | sphinx/cmd/quickstart.py | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sphinx/cmd/build.py b/sphinx/cmd/build.py index c4cf11cc4..f75b13fc8 100644 --- a/sphinx/cmd/build.py +++ b/sphinx/cmd/build.py @@ -16,7 +16,7 @@ import os import pdb import sys import traceback -from typing import Any, IO, List +from typing import IO, Any, List from docutils.utils import SystemMessage @@ -26,7 +26,7 @@ from sphinx.application import Sphinx from sphinx.errors import SphinxError from sphinx.locale import __ from sphinx.util import Tee, format_exception_cut_frames, save_traceback -from sphinx.util.console import red, nocolor, color_terminal, terminal_safe # type: ignore +from sphinx.util.console import color_terminal, nocolor, red, terminal_safe # type: ignore from sphinx.util.docutils import docutils_namespace, patch_docutils diff --git a/sphinx/cmd/make_mode.py b/sphinx/cmd/make_mode.py index 1961d37d5..8e5392238 100644 --- a/sphinx/cmd/make_mode.py +++ b/sphinx/cmd/make_mode.py @@ -22,10 +22,9 @@ from typing import List import sphinx from sphinx.cmd.build import build_main -from sphinx.util.console import color_terminal, nocolor, bold, blue # type: ignore +from sphinx.util.console import blue, bold, color_terminal, nocolor # type: ignore from sphinx.util.osutil import cd, rmtree - BUILDERS = [ ("", "html", "to make standalone HTML files"), ("", "dirhtml", "to make HTML files named index.html in directories"), diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py index dc587600c..6f0dd5de4 100644 --- a/sphinx/cmd/quickstart.py +++ b/sphinx/cmd/quickstart.py @@ -34,7 +34,7 @@ from docutils.utils import column_width import sphinx.locale from sphinx import __display_version__, package_dir from sphinx.locale import __ -from sphinx.util.console import colorize, bold, red, nocolor, color_terminal # type: ignore +from sphinx.util.console import bold, color_terminal, colorize, nocolor, red # type: ignore from sphinx.util.osutil import ensuredir from sphinx.util.template import SphinxRenderer |