griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: improve checks for function types for RNA introspection

Browse Source 
Function checks were too ambiguous making debugging difficult.
This commit is contained in:
Campbell Barton
2024-06-01 16:08:56 +10:00
parent 20d506941b
commit 90d513f7d3
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/modules/rna_info.py
View File

@@ -187,9 +187,15 @@ class InfoStructRNA:
import types
functions = []
for identifier, attr in self._get_py_visible_attrs():
# methods may be python wrappers to C functions
attr_func = getattr(attr, "__func__", attr)
if type(attr_func) in {types.FunctionType, types.MethodType}:
# Methods may be python wrappers to C functions.
ok = False
if (attr_func := getattr(attr, "__func__", None)) is not None:
if type(attr_func) == types.FunctionType:
ok = True
else:
if type(attr) in {types.FunctionType, types.MethodType}:
ok = True
if ok:
functions.append((identifier, attr))
return functions
@@ -197,13 +203,19 @@ class InfoStructRNA:
import types
functions = []
for identifier, attr in self._get_py_visible_attrs():
# methods may be python wrappers to C functions
attr_func = getattr(attr, "__func__", attr)
if (
(type(attr_func) in {types.BuiltinMethodType, types.BuiltinFunctionType}) or
# Methods may be python wrappers to C functions.
ok = False
if (attr_func := getattr(attr, "__func__", None)) is not None:
if type(attr_func) == types.BuiltinFunctionType:
ok = True
else:
if type(attr) == types.BuiltinMethodType:
ok = True
elif type(attr) == types.MethodDescriptorType:
# Without the `objclass` check, many inherited methods are included.
(type(attr_func) == types.MethodDescriptorType and attr_func.__objclass__ == self.py_class)
):
if attr.__objclass__ == self.py_class:
ok = True
if ok:
functions.append((identifier, attr))
return functions