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

static analysis is now able to tell the difference between NameError/AttributeError

Browse Source
This commit is contained in:
Dave Halter
2014-05-13 16:14:32 +02:00
parent 7632a7d120
commit 9bcc4f8fd2
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate/__init__.py
View File

@@ -108,7 +108,7 @@ class Evaluator(object):
scopes = f.scopes(search_global) scopes = f.scopes(search_global)
if is_goto: if is_goto:
return f.filter_name(scopes) return f.filter_name(scopes)
return f.find(scopes, resolve_decorator) return f.find(scopes, resolve_decorator, search_global)
@memoize_default(default=[], evaluator_is_first_arg=True) @memoize_default(default=[], evaluator_is_first_arg=True)
@recursion.recursion_decorator @recursion.recursion_decorator

5
jedi/evaluate/analysis.py
View File

@@ -9,8 +9,9 @@ from jedi.evaluate.compiled import CompiledObject
CODES = { CODES = {
'attribute-error': (1, AttributeError, 'Potential AttributeError.'), 'attribute-error': (1, AttributeError, 'Potential AttributeError.'),
'import-error': (2, ImportError, 'Potential ImportError.'), 'name-error': (2, NameError, 'Potential NameError.'),
'type-error-generator': (3, TypeError, "TypeError: 'generator' object is not subscriptable."), 'import-error': (3, ImportError, 'Potential ImportError.'),
'type-error-generator': (4, TypeError, "TypeError: 'generator' object is not subscriptable."),
} }

5
jedi/evaluate/finder.py
View File

@@ -34,7 +34,7 @@ class NameFinder(object):
self.name_str = name_str self.name_str = name_str
self.position = position self.position = position
def find(self, scopes, resolve_decorator=True): def find(self, scopes, resolve_decorator=True, search_global=False):
if unicode(self.name_str) == 'None': if unicode(self.name_str) == 'None':
# Filter None, because it's really just a keyword, nobody wants to # Filter None, because it's really just a keyword, nobody wants to
# access it. # access it.
@@ -47,7 +47,8 @@ class NameFinder(object):
and not (isinstance(self.name_str, pr.NamePart) and not (isinstance(self.name_str, pr.NamePart)
and isinstance(self.name_str.parent.parent, pr.Param)): and isinstance(self.name_str.parent.parent, pr.Param)):
if not isinstance(self.name_str, (str, unicode)): # TODO Remove if not isinstance(self.name_str, (str, unicode)): # TODO Remove
analysis.add(self._evaluator, 'attribute-error', self.name_str) err_type = 'name-error' if search_global else 'attribute-error'
analysis.add(self._evaluator, err_type, self.name_str)
debug.dbg('finder._names_to_types: %s, old: %s', names, types) debug.dbg('finder._names_to_types: %s, old: %s', names, types)
return self._resolve_descriptors(types) return self._resolve_descriptors(types)