diff options
| author | cocodrips <cocodrips@gmail.com> | 2018-12-26 11:31:44 +0900 |
|---|---|---|
| committer | cocodrips <cocodrips@gmail.com> | 2018-12-26 11:31:50 +0900 |
| commit | 827059be93426b83afd2fc7d823c48681e5f913a (patch) | |
| tree | ec1893e5cf77acbb79d736ea3f841dc864781740 /sphinx/util/pycompat.py | |
| parent | 448181d9f97611d352c0c8ec21e55e8242db9d60 (diff) | |
| parent | 99a7dca2160996e3189dfcc2176bbbbac531d5f3 (diff) | |
| download | sphinx-git-827059be93426b83afd2fc7d823c48681e5f913a.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 5842-apidoc-extensions
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: |