diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-09-22 21:53:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 21:53:00 +0900 |
| commit | 0e882d1587680c1f78258688599dbb90df4a7a60 (patch) | |
| tree | e6dba4193caab6649b4cc142fb17ad6fabed8382 /sphinx/pycode/parser.py | |
| parent | 02fea029bfc5bfd64e43de9e810aef2dd3c8cb2c (diff) | |
| parent | 6c1a696fe8e5c178d1dc5b4f5662eefc1fc65685 (diff) | |
| download | sphinx-git-0e882d1587680c1f78258688599dbb90df4a7a60.tar.gz | |
Merge branch 'master' into open
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'): |