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/pycode/parser.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/pycode/parser.py')
| -rw-r--r-- | sphinx/pycode/parser.py | 4 |
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') |