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

Get hasattr checks completely working

Browse Source
This commit is contained in:
Dave Halter
2014-12-12 02:34:25 +01:00
parent 8eaa008b5f
commit e8cc8f0a83
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jedi/evaluate/analysis.py
View File

@@ -160,8 +160,9 @@ def _check_for_exception_catch(evaluator, jedi_obj, exception, payload=None):
if check_match(cls, exception): if check_match(cls, exception):
return True return True
def check_hasattr(node): def check_hasattr(node, suite):
try: try:
assert suite.start_pos <= jedi_obj.start_pos < suite.end_pos
assert node.type == 'power' assert node.type == 'power'
base = node.children[0] base = node.children[0]
assert base.type == 'name' and base.value == 'hasattr' assert base.type == 'name' and base.value == 'hasattr'
@@ -175,14 +176,16 @@ def _check_for_exception_catch(evaluator, jedi_obj, exception, payload=None):
assert len(args) == 2 assert len(args) == 2
# Check name # Check name
assert len(args[1]) == 1 key, values = args[1]
names = evaluator.eval_element(args[1][0]) assert len(values) == 1
names = evaluator.eval_element(values[0])
assert len(names) == 1 and isinstance(names[0], CompiledObject) assert len(names) == 1 and isinstance(names[0], CompiledObject)
assert names[0].obj == str(payload[1]) assert names[0].obj == str(payload[1])
# Check objects # Check objects
assert len(args[0]) == 1 key, values = args[0]
objects = evaluator.eval_element(args[0][0]) assert len(values) == 1
objects = evaluator.eval_element(values[0])
return payload[0] in objects return payload[0] in objects
except AssertionError: except AssertionError:
return False return False
@@ -195,7 +198,7 @@ def _check_for_exception_catch(evaluator, jedi_obj, exception, payload=None):
return True return True
# hasattr check # hasattr check
if exception == AttributeError and obj.isinstance(pr.IfStmt, pr.WhileStmt): if exception == AttributeError and obj.isinstance(pr.IfStmt, pr.WhileStmt):
if check_hasattr(obj.children[1]): if check_hasattr(obj.children[1], obj.children[3]):
return True return True
obj = obj.parent obj = obj.parent