summaryrefslogtreecommitdiff
path: root/sphinx/setup_command.py
diff options
context:
space:
mode:
authorTakayuki Shimizukawa <shimizukawa@gmail.com>2014-05-01 00:09:44 +0900
committerTakayuki Shimizukawa <shimizukawa@gmail.com>2014-05-01 00:09:44 +0900
commit27ac8563000c34e121b536adffba658b257b50ff (patch)
tree074735c32b380ed8af895e5809ffc60a43484ec9 /sphinx/setup_command.py
parent2d1549b35a4adea66aebd0b7d9266731dd7ece6f (diff)
downloadsphinx-git-27ac8563000c34e121b536adffba658b257b50ff.tar.gz
tiny fix for py2/py3 compatibility in one source.
Diffstat (limited to 'sphinx/setup_command.py')
-rw-r--r--sphinx/setup_command.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py
index c2a661ee6..8ed171136 100644
--- a/sphinx/setup_command.py
+++ b/sphinx/setup_command.py
@@ -15,11 +15,10 @@ from __future__ import print_function
import sys
import os
-import types
from distutils.cmd import Command
from distutils.errors import DistutilsOptionError
-from six import StringIO
+from six import StringIO, string_types
from sphinx.application import Sphinx
from sphinx.util.console import darkred, nocolor, color_terminal
@@ -110,7 +109,7 @@ class BuildDoc(Command):
if val is None:
setattr(self, option, default)
return default
- elif not isinstance(val, types.StringTypes):
+ elif not isinstance(val, string_types):
raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
% (option, what, val))
return val