diff options
| author | shimizukawa <shimizukawa@gmail.com> | 2014-05-01 00:09:44 +0900 |
|---|---|---|
| committer | shimizukawa <shimizukawa@gmail.com> | 2014-05-01 00:09:44 +0900 |
| commit | 7732b39d8ccc49e2c9426bd13f3d1de152200e69 (patch) | |
| tree | 074735c32b380ed8af895e5809ffc60a43484ec9 | |
| parent | cec49503034a87ce14efa61edb81bf0706e0ea53 (diff) | |
| download | sphinx-7732b39d8ccc49e2c9426bd13f3d1de152200e69.tar.gz | |
tiny fix for py2/py3 compatibility in one source.
| -rw-r--r-- | sphinx/setup_command.py | 5 | ||||
| -rw-r--r-- | sphinx/util/osutil.py | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sphinx/setup_command.py b/sphinx/setup_command.py index c2a661ee..8ed17113 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 diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py index 50cf8ee5..9b5f58b7 100644 --- a/sphinx/util/osutil.py +++ b/sphinx/util/osutil.py @@ -189,12 +189,6 @@ def find_catalog_files(docname, srcdir, locale_dirs, lang, compaction): fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding() -if PY2: - bytes = str -else: - bytes = bytes - - def abspath(pathdir): pathdir = path.abspath(pathdir) if isinstance(pathdir, bytes): |