Changeset 391 for python/trunk/Objects/cobject.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Objects/cobject.c (modified) (3 diffs)

python/trunk/Objects/cobject.c

@@ -10 +10 @@
 typedef void (*destructor2)(void *, void*);
 
+static int cobject_deprecation_warning(void)
+{
+    return PyErr_WarnPy3k("CObject type is not supported in 3.x. "
+        "Please use capsule objects instead.", 1);
+}
+
+
 PyObject *
 PyCObject_FromVoidPtr(void *cobj, void (*destr)(void *))
 {
     PyCObject *self;
+
+    if (cobject_deprecation_warning()) {
+        return NULL;
+    }
 
     self = PyObject_NEW(PyCObject, &PyCObject_Type);
@@ -30 +41 @@
 {
     PyCObject *self;
+
+    if (cobject_deprecation_warning()) {
+        return NULL;
+    }
 
     if (!desc) {
@@ -51 +66 @@
 {
     if (self) {
+        if (PyCapsule_CheckExact(self)) {
+            const char *name = PyCapsule_GetName(self);
+            return (void *)PyCapsule_GetPointer(self, name);
+        }
         if (self->ob_type == &PyCObject_Type)
             return ((PyCObject *)self)->cobject;