1
0
forked from VimPlug/jedi

Refactor allowed_getattr_callback a bit to not raise random errors.

This commit is contained in:
Dave Halter
2017-12-24 12:55:32 +01:00
parent 993b0973c5
commit c3483344fe
2 changed files with 9 additions and 7 deletions

View File

@@ -310,12 +310,13 @@ class CompiledObjectFilter(AbstractFilter):
"""
To remove quite a few access calls we introduced the callback here.
"""
try:
if not allowed_getattr_callback():
return [self._get_cached_name(name, is_empty=True)]
except AttributeError:
has_attribute, is_descriptor = allowed_getattr_callback()
if not has_attribute:
return []
if is_descriptor:
return [self._get_cached_name(name, is_empty=True)]
if self._is_instance and name not in dir_callback():
return []
return [self._get_cached_name(name)]