Use cpp_python_extension() for xxclassloader, remove it from 3.10.cinder

Summary:
This is a native extension for testing Static Python.  It doesn't have to be
part of the 3.10.cinder runtime and accessible to everyone.  Only the CinderX
tests care about it.

Reviewed By: itamaro, DinoV

Differential Revision: D78563987

fbshipit-source-id: cb483e0b4f7f5b51a1eae8747540f5691d6715a5

Author: alexmalyshev

cinderx/PythonLib/test_cinderx/test_compiler/test_static/compile.py

@@ -1,5 +1,7 @@
 # Copyright (c) Meta Platforms, Inc. and affiliates.
 
+import __static__
+
 import ast
 import asyncio
 import builtins
@@ -15,7 +17,7 @@
 from tempfile import TemporaryDirectory
 from textwrap import dedent
 from types import ModuleType
-from typing import Callable
+from typing import Callable, cast
 from unittest import skip, skipIf, skipUnless
 from unittest.mock import patch
 
@@ -47,6 +49,8 @@
     type_mismatch,
 )
 
+STATIC_PATH: str = path.dirname(path.dirname(__static__.__file__))
+
 RICHARDS_PATH = path.join(
     path.dirname(__file__),
     "..",
@@ -786,7 +790,7 @@ def test_type_is_exact(self) -> None:
 
     def test_bind_instance(self) -> None:
         mod, comp = self.bind_module("class C: pass\na: C = C()")
-        assign = mod.body[1]
+        assign = cast(ast.AnnAssign, mod.body[1])
         types = comp.modules["foo"].types
         self.assertEqual(types[assign.target].name, "foo.C")
         self.assertEqual(repr(types[assign.target]), "<foo.C>")
@@ -808,6 +812,7 @@ def f(a):
                 x: bool = a
         """
         acomp = self.compile_strict(code)
+        assert acomp is not None
         x = self.find_code(acomp, "f")
         self.assertInBytecode(x, "CAST", ("builtins", "bool", "!"))
 
@@ -818,6 +823,7 @@ def f(a):
                 x: bool = a
         """
         acomp = self.compile_strict(code)
+        assert acomp is not None
         x = self.find_code(acomp, "f")
         self.assertInBytecode(x, "CAST", ("builtins", "bool", "!"))
 
@@ -1905,6 +1911,8 @@ def test_invoke_builtin_func_ret_neg(self) -> None:
         # do a direct invoke
         xxclassloader = sys.modules["xxclassloader"]
         try:
+            # pyre-ignore[6]: Pyre doesn't know that StrictModule is interchangeable
+            # with ModuleType.
             sys.modules["xxclassloader"] = StrictModule(xxclassloader.__dict__, False)
             codestr = """
             from xxclassloader import neg
@@ -5107,6 +5115,8 @@ def f(self):
             d = D()
             for _ in range(100):
                 try:
+                    # pyre-ignore[16]: Superclass is dynamically compiled and invisible
+                    # to pyre.
                     d.g().send(None)
                 except StopIteration as e:
                     self.assertEqual(e.args[0], 100)
@@ -5132,6 +5142,8 @@ def f(self):
 
             d = D()
             with self.assertRaises(TypeError):
+                # pyre-ignore[16]: Superclass is dynamically compiled and invisible to
+                # pyre.
                 d.g().send(None)
             loop.close()
 
@@ -5236,6 +5248,7 @@ class D(mod.C):
                 async def f(self):
                     return 0
 
+            # pyre-ignore[16]: Superclass is dynamically compiled and invisible to pyre.
             coro = D().g()
             with self.assertRaises(IndexError):
                 coro.send(None)
@@ -5257,10 +5270,12 @@ class D(mod.C):
                 def f(self):
                     return loop.create_future()
 
+            # pyre-ignore[16]: Superclass is dynamically compiled and invisible to pyre.
             coro = D().g()
             try:
                 coro.send(None)
             except RuntimeError as e:
+                # pyre-ignore[16]: Expecting __cause__ to exist.
                 self.assertEqual(e.__cause__.args[0], 100)
             loop.close()
 
@@ -5281,6 +5296,7 @@ class D(mod.C):
                 def f(self):
                     return loop.create_future()
 
+            # pyre-ignore[16]: Superclass is dynamically compiled and invisible to pyre.
             coro = D().g()
             with self.assertRaises(TypeError):
                 coro.send(None)
@@ -5302,6 +5318,7 @@ class D(mod.C):
                 async def f(self):
                     return 0
 
+            # pyre-ignore[16]: Superclass is dynamically compiled and invisible to pyre.
             coro = D().g()
             try:
                 coro.send(None)
@@ -5584,6 +5601,7 @@ def g():
                 (((mod.__name__,), "f"), 0),
             )
 
+    # pyre-ignore[56]: skip_unless_jit isn't fully typed yet.
     @skip_unless_jit("runs subprocess with JIT")
     def test_invoke_recursive_compile_respects_jitlist(self) -> None:
         with TemporaryDirectory() as d:
@@ -5628,7 +5646,9 @@ def f3():
                 "install-strict-loader",
                 "main.py",
             ]
-            proc = subprocess.run(cmd, capture_output=True, cwd=str(d))
+            proc = subprocess.run(
+                cmd, capture_output=True, cwd=str(d), env={"PYTHONPATH": STATIC_PATH}
+            )
             self.assertEqual(proc.returncode, 0, proc.stderr)
 
     def test_module_level_final_decl(self) -> None:

cinderx/PythonLib/test_cinderx/test_compiler/test_static/patch.py

@@ -8,19 +8,16 @@
 from unittest.mock import MagicMock, Mock, patch
 
 try:
-    from cinderx import getknobs, setknobs
+    from cinder import getknobs, setknobs
 except ImportError:
     getknobs = setknobs = None
 
+import xxclassloader
 
 from cinderx.compiler.pycodegen import PythonCodeGenerator
 
-from test.support.import_helper import import_module
-
 from .common import StaticTestBase
 
-xxclassloader = import_module("xxclassloader")
-
 
 @contextmanager
 def save_restore_knobs():
@@ -195,6 +192,7 @@ def g(d):
             f = mod.f
             import weakref
 
+            # pyre-ignore[61]: Not using `i` here.
             wr = weakref.ref(f, lambda *args: self.assertEqual(i, -1))  # noqa: F841
             del f
             for _ in range(100):
@@ -221,6 +219,7 @@ def g():
                 autospec=True,
                 return_value=100,
             ):
+                # pyre-ignore[6]: Intentionally setting an integer key to mess with the module dict.
                 mod.__dict__[42] = 1
                 self.assertEqual(g(), 100)
 
@@ -556,7 +555,9 @@ class D(C):
 
             C.f = 42
             a = D()
+            # pyre-ignore[16]: Superclass is dynamically compiled and invisible to pyre.
             a.f = 100
+            # pyre-ignore[16]: Superclass is dynamically compiled and invisible to pyre.
             self.assertEqual(a.get_f(), 100)
 
     def test_patch_static_to_static(self) -> None:
@@ -605,6 +606,8 @@ class E(D):
             with self.assertRaisesRegex(
                 TypeError, "unexpected return type from E.f, expected str, got int"
             ):
+                # pyre-ignore[16]: Superclass is dynamically compiled and invisible to
+                # pyre.
                 self.assertEqual(E().get_lower_f(), "ABC")
 
     def test_patch_method_mock(self) -> None:
@@ -1668,7 +1671,7 @@ def __get__(self, inst, ctx):
         with self.in_module(codestr) as mod:
             self.assertEqual(mod.f(mod.C()), 1)
             mod.C.prop = Desc()
-            self.assertRaises(
+            self.assertRaisesRegex(
                 TypeError,
                 "unexpected return type from C.prop, expected int, got str",
                 mod.f,