summaryrefslogtreecommitdiff
path: root/sphinx/setup_command.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/setup_command.py
parent5b7432b1ab333e4fe503b08d57732da1e5a25cf3 (diff)
parent280d2c79f835da6245c45523960b6ddf6f0088e0 (diff)
downloadsphinx-git-4647fcee456378c5001fe5ccbe7bff71fb799bf7.tar.gz
Merge branch '1.7-release'
Diffstat (limited to 'sphinx/setup_command.py')
-rw-r--r--sphinx/setup_command.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index 3ad16ae78..37fc2d042 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -13,13 +13,13 @@
"""
from __future__ import print_function
-import sys
import os
-
-from six import StringIO, string_types
+import sys
from distutils.cmd import Command
from distutils.errors import DistutilsOptionError, DistutilsExecError # type: ignore
+from six import StringIO, string_types
+
from sphinx.application import Sphinx
from sphinx.cmdline import handle_exception
from sphinx.util.console import nocolor, color_terminal