VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Merge with the linter branch (especially the changes of pep484.

Browse Source
This commit is contained in:
Dave Halter
2016-06-07 13:51:25 +02:00
parent ed152e440e 9c0f3f9535
commit 82c76fa689
27 changed files with 883 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jedi/api/keywords.py
View File

@@ -1,7 +1,7 @@
import pydoc
import keyword
from jedi._compatibility import is_py3
from jedi._compatibility import is_py3, is_py35
from jedi import common
from jedi.evaluate.helpers import FakeName
from jedi.parser.tree import Leaf
@@ -12,7 +12,12 @@ except ImportError:
import pydoc_topics
if is_py3:
keys = keyword.kwlist
if is_py35:
# in python 3.5 async and await are not proper keywords, but for
# completion pursposes should as as though they are
keys = keyword.kwlist + ["async", "await"]
else:
keys = keyword.kwlist
else:
keys = keyword.kwlist + ['None', 'False', 'True']