IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8528 from jdufresne/drop-workaround

Browse Source 
Drop outdated workaround for distutils' Command._ensure_stringlike()
This commit is contained in:
Takeshi KOMIYA 2020-12-13 00:11:15 +09:00 committed by GitHub
commit 8823d1c528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sphinx/setup_command.py
View File

@ -14,7 +14,7 @@
import os
import sys
from distutils.cmd import Command
from distutils.errors import DistutilsExecError, DistutilsOptionError
from distutils.errors import DistutilsExecError
from io import StringIO
from sphinx.application import Sphinx
@ -121,20 +121,6 @@ class BuildDoc(Command):
return root
return os.curdir
# Overriding distutils' Command._ensure_stringlike which doesn't support
# unicode, causing finalize_options to fail if invoked again. Workaround
# for https://bugs.python.org/issue19570
def _ensure_stringlike(self, option, what, default=None):
# type: (str, str, Any) -> Any
val = getattr(self, option)
if val is None:
setattr(self, option, default)
return default
elif not isinstance(val, str):
raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
% (option, what, val))
return val
def finalize_options(self):
# type: () -> None
self.ensure_string_list('builder')