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

Static analysis issues resolved (that were cause by the removal of using ExprStmt for every node).

Browse Source
This commit is contained in:
Dave Halter
2015-03-05 14:18:10 +01:00
parent e698e6aeeb
commit 76588aa040
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

@@ -103,8 +103,8 @@ def _check_for_setattr(instance):
for stmt in stmts) for stmt in stmts)
def add_attribute_error(evaluator, scope, name_part): def add_attribute_error(evaluator, scope, name):
message = ('AttributeError: %s has no attribute %s.' % (scope, name_part)) message = ('AttributeError: %s has no attribute %s.' % (scope, name))
from jedi.evaluate.representation import Instance from jedi.evaluate.representation import Instance
# Check for __getattr__/__getattribute__ existance and issue a warning # Check for __getattr__/__getattribute__ existance and issue a warning
# instead of an error, if that happens. # instead of an error, if that happens.
@@ -121,8 +121,8 @@ def add_attribute_error(evaluator, scope, name_part):
else: else:
typ = Error typ = Error
payload = scope, name_part payload = scope, name
add(evaluator, 'attribute-error', name_part, message, typ, payload) add(evaluator, 'attribute-error', name, message, typ, payload)
def _check_for_exception_catch(evaluator, jedi_obj, exception, payload=None): def _check_for_exception_catch(evaluator, jedi_obj, exception, payload=None):
@@ -244,8 +244,11 @@ def get_module_statements(module):
new = set() new = set()
for node in nodes: for node in nodes:
if isinstance(node, pr.Flow): if isinstance(node, pr.Flow):
children = node.children
if node.type == 'for_stmt':
children = children[2:] # Don't want to include the names.
# Pick the suite/simple_stmt. # Pick the suite/simple_stmt.
new |= add_nodes(node.children[-1].children) new |= add_nodes(children)
elif node.type in ('simple_stmt', 'suite'): elif node.type in ('simple_stmt', 'suite'):
new |= add_nodes(node.children) new |= add_nodes(node.children)
elif node.type in ('return_stmt', 'yield_expr'): elif node.type in ('return_stmt', 'yield_expr'):
@@ -254,7 +257,7 @@ def get_module_statements(module):
except IndexError: except IndexError:
pass pass
elif node.type not in ('whitespace', 'operator', 'keyword', elif node.type not in ('whitespace', 'operator', 'keyword',
'parameters', 'decorated') \ 'parameters', 'decorated', 'except_clause') \
and not isinstance(node, (pr.ClassOrFunc, pr.Import)): and not isinstance(node, (pr.ClassOrFunc, pr.Import)):
new.add(node) new.add(node)