summaryrefslogtreecommitdiff
path: root/sphinx/setup_command.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2020-11-12 02:50:43 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2020-11-12 02:50:43 +0900
commit279e547860ea68e3c357f55e608afec682a1f961 (patch)
treedc08e85ab0210538e30b5b801bf9d80ab49bfb3f /sphinx/setup_command.py
parent859b5fcea71f8d4f46e0ef3726e68df54bfbc3b7 (diff)
parent64fb1e56242d93ee0e8c317ab9e7643242b99658 (diff)
downloadsphinx-git-279e547860ea68e3c357f55e608afec682a1f961.tar.gz
Merge branch '3.x'
Diffstat (limited to 'sphinx/setup_command.py')
-rw-r--r--sphinx/setup_command.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index 9965aa15a..58f6c8256 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -14,13 +14,13 @@
import os
import sys
from distutils.cmd import Command
-from distutils.errors import DistutilsOptionError, DistutilsExecError
+from distutils.errors import DistutilsExecError, DistutilsOptionError
from io import StringIO
from typing import TYPE_CHECKING
from sphinx.application import Sphinx
from sphinx.cmd.build import handle_exception
-from sphinx.util.console import nocolor, color_terminal
+from sphinx.util.console import color_terminal, nocolor
from sphinx.util.docutils import docutils_namespace, patch_docutils
from sphinx.util.osutil import abspath