Skip to content

Commit

Permalink
always use the local name when building definitions
Browse files Browse the repository at this point in the history
Sometimes a class accesses a member by a different name than
   "__name__" of that member: in pypy3 `list.__mul__.__name__ ==
   "__rmul__"`.

As a result, in the example above we weren't able to find
   "list.__mul__", because it was recorded only as "list.__rmul__".

it's a part of the campaign to get rid of non-module roots
  • Loading branch information
temyurchenko committed Sep 13, 2024
1 parent a99967e commit 10dd6cd
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions astroid/raw_building.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,9 @@ def object_build_class(
) -> nodes.ClassDef:
"""create astroid for a living class object"""
basenames = [base.__name__ for base in member.__bases__]
return _base_class_object_build(node, member, basenames, localname=localname)
# N.B. ↓ why do we need to override the localname?
name = getattr(member, "__name__", localname)
return _base_class_object_build(node, member, basenames, name)


def _get_args_info_from_callable(
Expand Down Expand Up @@ -316,7 +318,7 @@ def object_build_function(
) = _get_args_info_from_callable(member)

func = build_function(
getattr(member, "__name__", None) or localname,
localname,
args,
posonlyargs,
defaults,
Expand All @@ -342,9 +344,7 @@ def object_build_methoddescriptor(
) -> None:
"""create astroid for a living method descriptor object"""
# FIXME get arguments ?
func = build_function(
getattr(member, "__name__", None) or localname, doc=member.__doc__
)
func = build_function(localname, doc=member.__doc__)
node.add_local_node(func, localname)
_add_dunder_class(func, node, member)

Expand All @@ -353,16 +353,13 @@ def _base_class_object_build(
node: nodes.Module | nodes.ClassDef,
member: type,
basenames: list[str],
name: str | None = None,
localname: str | None = None,
name: str,
) -> nodes.ClassDef:
"""create astroid for a living class object, with a given set of base names
(e.g. ancestors)
"""
class_name = name or getattr(member, "__name__", None) or localname
assert isinstance(class_name, str)
doc = member.__doc__ if isinstance(member.__doc__, str) else None
klass = build_class(class_name, node, basenames, doc)
klass = build_class(name, node, basenames, doc)
klass._newstyle = isinstance(member, type)
try:
# limit the instantiation trick since it's too dangerous
Expand Down

0 comments on commit 10dd6cd

Please sign in to comment.