Improvements

Author: efimov-mikhail

Lib/test/test_stackrefs.py

@@ -6,74 +6,50 @@
 except ImportError:
     _testinternalcapi = None
 
-
-class StackRef:
-    def __init__(self, obj, flags):
-        self.obj = obj
-        self.flags = flags
-        self.refcount = sys.getrefcount(obj)
-
-    def __str__(self):
-        return f"StackRef(obj={self.obj}, flags={self.flags}, refcount={self.refcount})"
-
-    def __eq__(self, other):
-        return (
-            self.obj is other.obj
-            and self.flags == other.flags
-            and self.refcount == other.refcount
-        )
-
-    def __hash__(self):
-        return tuple.__hash__((self.obj, self.flags, self.refcount))
-
-
 @cpython_only
-class TestStackRef(unittest.TestCase):
+class TestDefinition(unittest.TestCase):
 
-    def test_equivalent(self):
+    def test_equivalence(self):
         def run_with_refcount_check(self, func, obj):
             refcount = sys.getrefcount(obj)
             res = func(obj)
             self.assertEqual(sys.getrefcount(obj), refcount)
             return res
 
-        def stackref_from_object_borrow(obj):
-            return _testinternalcapi.stackref_from_object_borrow(obj)
-
-        funcs = [
+        funcs_with_incref = [
             _testinternalcapi.stackref_from_object_new,
-            _testinternalcapi.stackref_from_object_new2,
             _testinternalcapi.stackref_from_object_steal_with_incref,
             _testinternalcapi.stackref_make_heap_safe,
             _testinternalcapi.stackref_make_heap_safe_with_borrow,
             _testinternalcapi.stackref_strong_reference,
         ]
 
-        funcs2 = [
+        funcs_with_borrow = [
             _testinternalcapi.stackref_from_object_borrow,
             _testinternalcapi.stackref_dup_borrowed_with_close,
         ]
 
-        for obj in (None, True, False, 42, '1'):
+        immortal_objs = (None, True, False, 42, '1')
+
+        for obj in immortal_objs:
             results = set()
-            for func in funcs + funcs2:
+            for func in funcs_with_incref + funcs_with_borrow:
                 res = run_with_refcount_check(self, func, obj)
-                #print(func.__name__, obj, res)
                 results.add(res)
             self.assertEqual(len(results), 1)
 
-        for obj in (5000, range(10)):
+        mortal_objs = (5000, 3+2j, range(10))
+
+        for obj in mortal_objs:
             results = set()
-            for func in funcs:
+            for func in funcs_with_incref:
                 res = run_with_refcount_check(self, func, obj)
-                #print(func.__name__, obj, res)
                 results.add(res)
             self.assertEqual(len(results), 1)
 
             results = set()
-            for func in funcs2:
+            for func in funcs_with_borrow:
                 res = run_with_refcount_check(self, func, obj)
-                #print(func.__name__, obj, res)
                 results.add(res)
             self.assertEqual(len(results), 1)
 

Modules/_testinternalcapi.c

@@ -2439,23 +2439,14 @@ stackref_from_object_new(PyObject *self, PyObject *op)
     return obj;
 }
 
-static PyObject *
-stackref_from_object_new2(PyObject *self, PyObject *op)
-{
-    _PyStackRef ref = PyStackRef_FromPyObjectNew(op);
-    PyObject *obj = stackref_to_tuple(ref, op);
-    PyObject *op2 = PyStackRef_AsPyObjectSteal(ref);
-    Py_DECREF(op2);
-    return obj;
-}
-
 static PyObject *
 stackref_from_object_steal_with_incref(PyObject *self, PyObject *op)
 {
     Py_INCREF(op);
     _PyStackRef ref = PyStackRef_FromPyObjectSteal(op);
     PyObject *obj = stackref_to_tuple(ref, op);
-    PyStackRef_CLOSE(ref);
+    PyObject *op2 = PyStackRef_AsPyObjectSteal(ref);
+    Py_DECREF(op2);
     return obj;
 }
 
@@ -2622,7 +2613,6 @@ static PyMethodDef module_functions[] = {
     {"simple_pending_call", simple_pending_call, METH_O},
     {"set_vectorcall_nop", set_vectorcall_nop, METH_O},
     {"stackref_from_object_new", stackref_from_object_new, METH_O},
-    {"stackref_from_object_new2", stackref_from_object_new2, METH_O},
     {"stackref_from_object_steal_with_incref", stackref_from_object_steal_with_incref, METH_O},
     {"stackref_make_heap_safe", stackref_make_heap_safe, METH_O},
     {"stackref_make_heap_safe_with_borrow", stackref_make_heap_safe_with_borrow, METH_O},