diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-12-26 01:31:33 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-26 01:31:33 +0900 |
commit | 99a7dca2160996e3189dfcc2176bbbbac531d5f3 (patch) | |
tree | 6924a65a62f2191e2f7fe30d3af9ac9da2ca4c48 /sphinx/util/pycompat.py | |
parent | f811e4cea696d1dd724f61fb7226b5187b69fac9 (diff) | |
parent | 6978918ffc14b0b096285adfa0c90f95de281efa (diff) | |
download | sphinx-git-99a7dca2160996e3189dfcc2176bbbbac531d5f3.tar.gz |
Merge pull request #5806 from jdufresne/six-text-type
Replace use of six.text_type with str
Diffstat (limited to 'sphinx/util/pycompat.py')
-rw-r--r-- | sphinx/util/pycompat.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sphinx/util/pycompat.py b/sphinx/util/pycompat.py index 0256ce0c2..df310368e 100644 --- a/sphinx/util/pycompat.py +++ b/sphinx/util/pycompat.py @@ -14,8 +14,6 @@ from html import escape as htmlescape # NOQA from io import TextIOWrapper # NOQA from textwrap import indent # NOQA -from six import text_type - from sphinx.deprecation import RemovedInSphinx40Warning from sphinx.locale import __ from sphinx.util import logging @@ -64,7 +62,7 @@ def convert_with_2to3(filepath): lineno, offset = err.context[1] # try to match ParseError details with SyntaxError details raise SyntaxError(err.msg, (filepath, lineno, offset, err.value)) - return text_type(tree) + return str(tree) class UnicodeMixin: |