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.

1 files changed, 3 insertions, 5 deletions

diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index 4dc9ce543..a341212cf 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -17,18 +17,16 @@ from pygments.filters import ErrorToken
 from pygments.formatter import Formatter
 from pygments.formatters import HtmlFormatter, LatexFormatter
 from pygments.lexer import Lexer
-from pygments.lexers import get_lexer_by_name, guess_lexer
-from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \
-    CLexer, TextLexer, RstLexer
+from pygments.lexers import (CLexer, Python3Lexer, PythonConsoleLexer, PythonLexer, RstLexer,
+                             TextLexer, get_lexer_by_name, guess_lexer)
 from pygments.style import Style
 from pygments.styles import get_style_by_name
 from pygments.util import ClassNotFound
 
 from sphinx.locale import __
-from sphinx.pygments_styles import SphinxStyle, NoneStyle
+from sphinx.pygments_styles import NoneStyle, SphinxStyle
 from sphinx.util import logging, texescape
 
-
 logger = logging.getLogger(__name__)
 
 lexers = {}  # type: Dict[str, Lexer]