Sort imports with isort

Keep imports alphabetically sorted and their order homogeneous across
Python source files.

The isort project has more feature and is more active than the
flake8-import-order plugin.

Most issues caught were simply import ordering from the same module.
Where imports were purposefully placed out of order, tag with
isort:skip.

3 files changed, 5 insertions, 7 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 aff2ea7f5..9043868e1 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 2363f9fe4..f9def2656 100644
--- a/sphinx/cmd/quickstart.py
+++ b/sphinx/cmd/quickstart.py
@@ -37,9 +37,8 @@ import sphinx.locale
 from sphinx import __display_version__, package_dir
 from sphinx.deprecation import RemovedInSphinx40Warning
 from sphinx.locale import __
-from sphinx.util.console import (  # type: ignore
-    colorize, bold, red, turquoise, nocolor, color_terminal
-)
+from sphinx.util.console import (bold, color_terminal, colorize, nocolor, red,  # type: ignore
+                                 turquoise)
 from sphinx.util.osutil import ensuredir
 from sphinx.util.template import SphinxRenderer