diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-09-22 22:17:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 22:17:38 +0900 |
| commit | 6f25bd3680e9139e55e0969f852dbf6ee03de445 (patch) | |
| tree | 1c95f7f4ee2afaafc9093f3e84a5ea4fe8a93d77 /sphinx/pycode/parser.py | |
| parent | 0d6be504ea4afc786b40ff8b87193ccdb0796951 (diff) | |
| parent | 323d27ef8f63b8bb2e351ddf5fd2cd89abb97df8 (diff) | |
| download | sphinx-git-6f25bd3680e9139e55e0969f852dbf6ee03de445.tar.gz | |
Merge branch 'master' into drop-iteritems
Diffstat (limited to 'sphinx/pycode/parser.py')
| -rw-r--r-- | sphinx/pycode/parser.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sphinx/pycode/parser.py b/sphinx/pycode/parser.py index 9d464a253..1ca32eeb4 100644 --- a/sphinx/pycode/parser.py +++ b/sphinx/pycode/parser.py @@ -17,7 +17,7 @@ import tokenize from token import NAME, NEWLINE, INDENT, DEDENT, NUMBER, OP, STRING from tokenize import COMMENT, NL -from six import PY2, text_type +from six import text_type if False: # For type annotation @@ -59,10 +59,7 @@ def get_lvar_names(node, self=None): # => TypeError """ if self: - if PY2: - self_id = self.id # type: ignore - else: - self_id = self.arg + self_id = self.arg # type: ignore node_name = node.__class__.__name__ if node_name in ('Index', 'Num', 'Slice', 'Str', 'Subscript'): |