summaryrefslogtreecommitdiff
path: root/sphinx/cmdline.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2018-01-31 20:40:56 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2018-01-31 20:40:56 +0900
commit4647fcee456378c5001fe5ccbe7bff71fb799bf7 (patch)
treef3ff5f85e45bd79979ddae5af2c157bdfeaa5001 /sphinx/cmdline.py
parent5b7432b1ab333e4fe503b08d57732da1e5a25cf3 (diff)
parent280d2c79f835da6245c45523960b6ddf6f0088e0 (diff)
downloadsphinx-git-4647fcee456378c5001fe5ccbe7bff71fb799bf7.tar.gz
Merge branch '1.7-release'
Diffstat (limited to 'sphinx/cmdline.py')
-rw-r--r--sphinx/cmdline.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index 264ee30fe..848dbc789 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -11,8 +11,8 @@
from __future__ import print_function
import argparse
-import os
import multiprocessing
+import os
import sys
import traceback
@@ -20,8 +20,8 @@ from docutils.utils import SystemMessage
from six import text_type, binary_type
from sphinx import __display_version__
-from sphinx.errors import SphinxError
from sphinx.application import Sphinx
+from sphinx.errors import SphinxError
from sphinx.util import Tee, format_exception_cut_frames, save_traceback
from sphinx.util.console import red, nocolor, color_terminal # type: ignore
from sphinx.util.docutils import docutils_namespace, patch_docutils