Refactor allowed_getattr_callback a bit to not raise random errors.
This commit is contained in:
1 parent
993b0973c5
commit
c3483344fe
2 files changed
+9
-7
No files matched your search
@@ -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)]
|
||||
|
||||
Reference in new issue
Block a user