Replace obsolete, unsafe Py_TRASHCAN_SAFE_BEGIN/END

musicinmybrain · musicinmybrain · commit 2f7cbbb0bd36 · 2024-07-12T10:47:51.000-04:00
Use Py_TRASHCAN_BEGIN/END instead. https://bugs.python.org/issue44874 These are removed from the limited C API in Python 3.9, deprecated in 3.11, and removed in Python 3.13: https://docs.python.org/3.13/whatsnew/3.13.html#id8
diff --git a/asyncpg/protocol/record/recordobj.c b/asyncpg/protocol/record/recordobj.c
@@ -98,7 +98,7 @@ record_dealloc(ApgRecordObject *o)
 
     Py_CLEAR(o->desc);
 
-    Py_TRASHCAN_SAFE_BEGIN(o)
+    Py_TRASHCAN_BEGIN(o, record_dealloc)
     if (len > 0) {
         i = len;
         while (--i >= 0) {
@@ -117,7 +117,7 @@ record_dealloc(ApgRecordObject *o)
     }
     Py_TYPE(o)->tp_free((PyObject *)o);
 done:
-    Py_TRASHCAN_SAFE_END(o)
+    Py_TRASHCAN_END
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ record_dealloc(ApgRecordObject *o)`
`98`	`98`
`99`	`99`	`Py_CLEAR(o->desc);`
`100`	`100`
`101`		`- Py_TRASHCAN_SAFE_BEGIN(o)`
	`101`	`+ Py_TRASHCAN_BEGIN(o, record_dealloc)`
`102`	`102`	`if (len > 0) {`
`103`	`103`	`i = len;`
`104`	`104`	`while (--i >= 0) {`
`@@ -117,7 +117,7 @@ record_dealloc(ApgRecordObject *o)`
`117`	`117`	`}`
`118`	`118`	`Py_TYPE(o)->tp_free((PyObject *)o);`
`119`	`119`	`done:`
`120`		`- Py_TRASHCAN_SAFE_END(o)`
	`120`	`+ Py_TRASHCAN_END`
`121`	`121`	`}`
`122`	`122`
`123`	`123`