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

eval_statement input shouldn't be a NamePart, but a string

Browse Source
This commit is contained in:
Dave Halter
2014-04-22 11:33:46 +02:00
parent 8dc7f6a771
commit 77d505e251
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/evaluate/finder.py
+4 -4
View File
@@ -218,7 +218,7 @@ class NameFinder(object):
check_instance = stmt.instance check_instance = stmt.instance
stmt = stmt.var stmt = stmt.var
types += evaluator.eval_statement(stmt, seek_name=self.name_str) types += evaluator.eval_statement(stmt, seek_name=unicode(self.name_str))
if check_instance is not None: if check_instance is not None:
# class renames # class renames
@@ -268,7 +268,7 @@ class NameFinder(object):
# this means that there are no default params, # this means that there are no default params,
# so just ignore it. # so just ignore it.
return res_new return res_new
return res_new + evaluator.eval_statement(param, seek_name=self.name_str) return res_new + evaluator.eval_statement(param, seek_name=unicode(self.name_str))
def _handle_for_loops(self, loop): def _handle_for_loops(self, loop):
# Take the first statement (for has always only # Take the first statement (for has always only
@@ -279,7 +279,7 @@ class NameFinder(object):
if len(loop.set_vars) > 1: if len(loop.set_vars) > 1:
expression_list = loop.set_stmt.expression_list() expression_list = loop.set_stmt.expression_list()
# loops with loop.set_vars > 0 only have one command # loops with loop.set_vars > 0 only have one command
result = _assign_tuples(expression_list[0], result, self.name_str) result = _assign_tuples(expression_list[0], result, unicode(self.name_str))
return result return result
def _resolve_descriptors(self, types): def _resolve_descriptors(self, types):
@@ -529,7 +529,7 @@ def find_assignments(lhs, results, seek_name):
""" """
if isinstance(lhs, pr.Array): if isinstance(lhs, pr.Array):
return _assign_tuples(lhs, results, seek_name) return _assign_tuples(lhs, results, seek_name)
elif unicode(lhs.name.names[-1]) == unicode(seek_name): elif unicode(lhs.name.names[-1]) == seek_name:
return results return results
else: else:
return [] return []