summaryrefslogtreecommitdiff
path: root/sphinx/pycode
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/pycode
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/pycode')
-rw-r--r--sphinx/pycode/parser.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/sphinx/pycode/parser.py b/sphinx/pycode/parser.py
index ec04aecab..8aa2815d0 100644
--- a/sphinx/pycode/parser.py
+++ b/sphinx/pycode/parser.py
@@ -16,8 +16,6 @@ import tokenize
from token import NAME, NEWLINE, INDENT, DEDENT, NUMBER, OP, STRING
from tokenize import COMMENT, NL
-from six import text_type
-
if False:
# For type annotation
from typing import Any, Dict, IO, List, Tuple # NOQA
@@ -349,7 +347,7 @@ class VariableCommentPicker(ast.NodeVisitor):
targets = get_assign_targets(self.previous)
varnames = get_lvar_names(targets[0], self.get_self())
for varname in varnames:
- if isinstance(node.value.s, text_type):
+ if isinstance(node.value.s, str):
docstring = node.value.s
else:
docstring = node.value.s.decode(self.encoding or 'utf-8')