Merge branch 'main' into fix-issue-43633

Author: asvetlov

Lib/test/test_clinic.py

@@ -318,6 +318,26 @@ def test_unknown_destination_command(self):
         msg = "unknown destination command 'nosuchcommand'"
         self.assertIn(msg, out)
 
+    def test_no_access_to_members_in_converter_init(self):
+        out = self.expect_failure("""
+            /*[python input]
+            class Custom_converter(CConverter):
+                converter = "some_c_function"
+                def converter_init(self):
+                    self.function.noaccess
+            [python start generated code]*/
+            /*[clinic input]
+            module test
+            test.fn
+                a: Custom
+            [clinic start generated code]*/
+        """)
+        msg = (
+            "Stepped on a land mine, trying to access attribute 'noaccess':\n"
+            "Don't access members of self.function inside converter_init!"
+        )
+        self.assertIn(msg, out)
+
 
 class ClinicGroupPermuterTest(TestCase):
     def _test(self, l, m, r, output):

Lib/test/test_ctypes/test_as_parameter.py

@@ -192,7 +192,7 @@ class S8I(Structure):
                              (9*2, 8*3, 7*4, 6*5, 5*6, 4*7, 3*8, 2*9))
 
     def test_recursive_as_param(self):
-        class A(object):
+        class A:
             pass
 
         a = A()
@@ -201,15 +201,15 @@ class A(object):
             c_int.from_param(a)
 
 
-class AsParamWrapper(object):
+class AsParamWrapper:
     def __init__(self, param):
         self._as_parameter_ = param
 
 class AsParamWrapperTestCase(BasicWrapTestCase):
     wrap = AsParamWrapper
 
 
-class AsParamPropertyWrapper(object):
+class AsParamPropertyWrapper:
     def __init__(self, param):
         self._param = param
 

Lib/test/test_ctypes/test_callbacks.py

@@ -120,7 +120,7 @@ def test_unsupported_restype_2(self):
     def test_issue_7959(self):
         proto = self.functype.__func__(None)
 
-        class X(object):
+        class X:
             def func(self): pass
             def __init__(self):
                 self.v = proto(self.func)

Lib/test/test_ctypes/test_numbers.py

@@ -86,7 +86,7 @@ def test_byref(self):
     def test_floats(self):
         # c_float and c_double can be created from
         # Python int and float
-        class FloatLike(object):
+        class FloatLike:
             def __float__(self):
                 return 2.0
         f = FloatLike()
@@ -97,15 +97,15 @@ def __float__(self):
             self.assertEqual(t(f).value, 2.0)
 
     def test_integers(self):
-        class FloatLike(object):
+        class FloatLike:
             def __float__(self):
                 return 2.0
         f = FloatLike()
-        class IntLike(object):
+        class IntLike:
             def __int__(self):
                 return 2
         d = IntLike()
-        class IndexLike(object):
+        class IndexLike:
             def __index__(self):
                 return 2
         i = IndexLike()

Lib/test/test_ctypes/test_parameters.py

@@ -157,15 +157,15 @@ def test_noctypes_argtype(self):
         # TypeError: has no from_param method
         self.assertRaises(TypeError, setattr, func, "argtypes", (object,))
 
-        class Adapter(object):
+        class Adapter:
             def from_param(cls, obj):
                 return None
 
         func.argtypes = (Adapter(),)
         self.assertEqual(func(None), None)
         self.assertEqual(func(object()), None)
 
-        class Adapter(object):
+        class Adapter:
             def from_param(cls, obj):
                 return obj
 
@@ -174,7 +174,7 @@ def from_param(cls, obj):
         self.assertRaises(ArgumentError, func, object())
         self.assertEqual(func(c_void_p(42)), 42)
 
-        class Adapter(object):
+        class Adapter:
             def from_param(cls, obj):
                 raise ValueError(obj)
 

Python/import.c

@@ -601,7 +601,7 @@ _PyImport_ClearModulesByIndex(PyInterpreterState *interp)
     when an extension is loaded.  This includes when it is imported
     for the first time.
 
-    Here's a summary, using importlib._boostrap._load() as a starting point.
+    Here's a summary, using importlib._bootstrap._load() as a starting point.
 
     1.  importlib._bootstrap._load()
     2.    _load():  acquire import lock