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

Finally fix all python 3.4 tests again.

Browse Source
This commit is contained in:
Dave Halter
2016-07-01 20:59:24 +02:00
parent 67a0f604a7
commit 609965d07c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jedi/api/completion.py
View File

@@ -127,17 +127,14 @@ class Completion:
allowed_keywords, allowed_tokens = \ allowed_keywords, allowed_tokens = \
helpers.get_possible_completion_types(grammar, stack) helpers.get_possible_completion_types(grammar, stack)
print(allowed_keywords, [token.tok_name[a] for a in allowed_tokens])
completion_names = list(self._get_keyword_completion_names(allowed_keywords)) completion_names = list(self._get_keyword_completion_names(allowed_keywords))
if token.NAME in allowed_tokens: if token.NAME in allowed_tokens:
# This means that we actually have to do type inference. # This means that we actually have to do type inference.
symbol_names = list(stack.get_node_names(grammar)) symbol_names = list(stack.get_node_names(grammar))
print('symbolnames',symbol_names)
nodes = list(stack.get_nodes()) nodes = list(stack.get_nodes())
last_symbol = symbol_names[-1]
if "import_stmt" in symbol_names: if "import_stmt" in symbol_names:
level = 0 level = 0

3
jedi/evaluate/compiled/__init__.py
View File

@@ -303,8 +303,9 @@ class LazyNamesDict(object):
# The dir function can be wrong. # The dir function can be wrong.
pass pass
is_instance = self._is_instance or fake.is_class_instance(obj)
# ``dir`` doesn't include the type names. # ``dir`` doesn't include the type names.
if not inspect.ismodule(obj) and obj != type and not self._is_instance: if not inspect.ismodule(obj) and obj != type and not is_instance:
values += create(self._evaluator, type).names_dict.values() values += create(self._evaluator, type).names_dict.values()
return values return values