summaryrefslogtreecommitdiff
path: root/sphinx/highlighting.py
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2018-12-26 01:31:33 +0900
committerGitHub <noreply@github.com>2018-12-26 01:31:33 +0900
commit99a7dca2160996e3189dfcc2176bbbbac531d5f3 (patch)
tree6924a65a62f2191e2f7fe30d3af9ac9da2ca4c48 /sphinx/highlighting.py
parentf811e4cea696d1dd724f61fb7226b5187b69fac9 (diff)
parent6978918ffc14b0b096285adfa0c90f95de281efa (diff)
downloadsphinx-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/highlighting.py')
-rw-r--r--sphinx/highlighting.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/sphinx/highlighting.py b/sphinx/highlighting.py
index 12fec930e..5fac63963 100644
--- a/sphinx/highlighting.py
+++ b/sphinx/highlighting.py
@@ -20,7 +20,6 @@ from pygments.lexers import PythonLexer, Python3Lexer, PythonConsoleLexer, \
CLexer, TextLexer, RstLexer
from pygments.styles import get_style_by_name
from pygments.util import ClassNotFound
-from six import text_type
from sphinx.deprecation import RemovedInSphinx30Warning
from sphinx.ext import doctest
@@ -113,7 +112,7 @@ class PygmentsBridge:
def highlight_block(self, source, lang, opts=None, location=None, force=False, **kwargs):
# type: (str, str, Any, Any, bool, Any) -> str
- if not isinstance(source, text_type):
+ if not isinstance(source, str):
source = source.decode()
# find out which lexer to use