Detect builtins module on PyPy 3.9 (#1567)

Author: jacobtylerwalls

.github/workflows/ci.yaml

@@ -282,7 +282,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["pypy-3.7", "pypy-3.8"]
+        python-version: ["pypy-3.7", "pypy-3.8", "pypy-3.9"]
     steps:
       - name: Check out code from GitHub
         uses: actions/[email protected]

ChangeLog

@@ -8,6 +8,8 @@ Release date: TBA
 
 * ``astroid`` now requires Python 3.7.2 to run.
 
+* Fix detection of builtins on ``PyPy`` 3.9.
+
 * Fix ``re`` brain on Python ``3.11``. The flags now come from ``re._compile``.
 
 * Build ``nodes.Module`` for frozen modules which have location information in their

astroid/interpreter/_import/spec.py

@@ -105,22 +105,22 @@ def find_module(
     ) -> ModuleSpec | None:
         if submodule_path is not None:
             submodule_path = list(submodule_path)
+        elif modname in sys.builtin_module_names:
+            return ModuleSpec(
+                name=modname,
+                location=None,
+                type=ModuleType.C_BUILTIN,
+            )
         else:
             try:
                 spec = importlib.util.find_spec(modname)
-                if spec:
-                    if spec.loader is importlib.machinery.BuiltinImporter:
-                        return ModuleSpec(
-                            name=modname,
-                            location=None,
-                            type=ModuleType.C_BUILTIN,
-                        )
-                    if spec.loader is importlib.machinery.FrozenImporter:
-                        return ModuleSpec(
-                            name=modname,
-                            location=getattr(spec.loader_state, "filename", None),
-                            type=ModuleType.PY_FROZEN,
-                        )
+                if spec and spec.loader is importlib.machinery.FrozenImporter:
+                    # No need for BuiltinImporter; builtins handled above
+                    return ModuleSpec(
+                        name=modname,
+                        location=getattr(spec.loader_state, "filename", None),
+                        type=ModuleType.PY_FROZEN,
+                    )
             except ValueError:
                 pass
             submodule_path = sys.path

astroid/raw_building.py

@@ -17,6 +17,7 @@
 from collections.abc import Iterable
 
 from astroid import bases, nodes
+from astroid.const import IS_PYPY
 from astroid.manager import AstroidManager
 from astroid.nodes import node_classes
 
@@ -321,6 +322,9 @@ def object_build(self, node, obj):
             return self._done[obj]
         self._done[obj] = node
         for name in dir(obj):
+            # inspect.ismethod() and inspect.isbuiltin() in PyPy return
+            # the opposite of what they do in CPython for __class_getitem__.
+            pypy__class_getitem__ = IS_PYPY and name == "__class_getitem__"
             try:
                 with warnings.catch_warnings():
                     warnings.simplefilter("error")
@@ -329,11 +333,11 @@ def object_build(self, node, obj):
                 # damned ExtensionClass.Base, I know you're there !
                 attach_dummy_node(node, name)
                 continue
-            if inspect.ismethod(member):
+            if inspect.ismethod(member) and not pypy__class_getitem__:
                 member = member.__func__
             if inspect.isfunction(member):
                 _build_from_function(node, name, member, self._module)
-            elif inspect.isbuiltin(member):
+            elif inspect.isbuiltin(member) or pypy__class_getitem__:
                 if self.imported_member(node, member, name):
                     continue
                 object_build_methoddescriptor(node, member, name)