Replace the deprecated PyCObject api with PyCapsule.

kristjan.jonsson · kristjan.jonsson · commit c7229b7b4ef0 · 2010-06-30T12:30:04.000Z
git-svn-id: http://svn.python.org/projects/stackless/trunk@82395 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Stackless/module/scheduling.c b/Stackless/module/scheduling.c
@@ -562,11 +562,14 @@ next ? next->flags.blocked : 0)
 /* make sure that locks live longer than their threads */
 
 static void
-destruct_lock(PyThread_type_lock lock)
+destruct_lock(PyObject *capsule)
 {
-    PyThread_acquire_lock(lock, 0);
-    PyThread_release_lock(lock);
-    PyThread_free_lock(lock);
+    PyThread_type_lock lock = PyCapsule_GetPointer(capsule, 0);
+    if (lock) {
+        PyThread_acquire_lock(lock, 0);
+        PyThread_release_lock(lock);
+        PyThread_free_lock(lock);
+    }
 }
 
 static PyObject *
@@ -577,10 +580,10 @@ new_lock(void)
     lock = PyThread_allocate_lock();
     if (lock == NULL) return NULL;
 
-    return PyCObject_FromVoidPtr(lock, destruct_lock);
+    return PyCapsule_New(lock, 0, destruct_lock);
 }
 
-#define get_lock(obj) PyCObject_AsVoidPtr(obj)
+#define get_lock(obj) PyCapsule_GetPointer(obj, 0)
 
 #define acquire_lock(lock, flag) PyThread_acquire_lock(get_lock(lock), flag)
 #define release_lock(lock) PyThread_release_lock(get_lock(lock))
