Merge pull request #238 from wiredfool/pycapsule

Use PyCapsule for py3.1, fixes #237
This commit is contained in:
Alex Clark ☺ 2013-05-29 03:39:18 -07:00
commit eeac3fedef

View File

@ -3044,7 +3044,7 @@ _getattr_id(ImagingObject* self, void* closure)
static PyObject* static PyObject*
_getattr_ptr(ImagingObject* self, void* closure) _getattr_ptr(ImagingObject* self, void* closure)
{ {
#if PY_VERSION_HEX >= 0x03020000 #if (PY_VERSION_HEX >= 0x02070000 && PY_VERSION_HEX < 0x03000000) || PY_VERSION_HEX >= 0x03010000
return PyCapsule_New(self->image, IMAGING_MAGIC, NULL); return PyCapsule_New(self->image, IMAGING_MAGIC, NULL);
#else #else
return PyCObject_FromVoidPtrAndDesc(self->image, IMAGING_MAGIC, NULL); return PyCObject_FromVoidPtrAndDesc(self->image, IMAGING_MAGIC, NULL);