rename PyCapsule -> Capsule

uploadcare · Sep 3, 2024 · bf11639 · bf11639
1 parent 147f75e
commit bf11639
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/docs/deprecations.rst b/docs/deprecations.rst
@@ -144,7 +144,7 @@ Get Internal Pointers to Objects
 ``Image.core.ImageCore.id`` and ``Image.core.ImageCore.unsafe_ptrs``
 have been deprecated and will be removed in Pillow 12 (2025-10-15).
 They were used for obtaining raw pointers to ``ImageCore`` internals. To interact with
-C code, you can use ``Image.core.ImageCore.ptr``, which returns a ``PyCapsule`` object.
+C code, you can use ``Image.core.ImageCore.ptr``, which returns a ``Capsule`` object.
 
 Removed features
 ----------------

diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c
@@ -79,9 +79,7 @@ ImagingFind(const char *name) {
     }
 
     if (!PyCapsule_IsValid(capsule, IMAGING_MAGIC)) {
-        PyErr_Format(
-            PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC
-        );
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }
 

diff --git a/src/_imagingcms.c b/src/_imagingcms.c
@@ -541,9 +541,7 @@ cms_transform_apply(CmsTransformObject *self, PyObject *args) {
 
     if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) ||
         !PyCapsule_IsValid(i1, IMAGING_MAGIC)) {
-        PyErr_Format(
-            PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC
-        );
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }
 

diff --git a/src/_imagingmath.c b/src/_imagingmath.c
@@ -177,16 +177,12 @@ _unop(PyObject *self, PyObject *args) {
     }
 
     if (!PyCapsule_IsValid(op, MATH_FUNC_UNOP_MAGIC)) {
-        PyErr_Format(
-            PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_UNOP_MAGIC
-        );
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_UNOP_MAGIC);
         return NULL;
     }
     if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) ||
         !PyCapsule_IsValid(i1, IMAGING_MAGIC)) {
-        PyErr_Format(
-            PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC
-        );
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }
 
@@ -213,17 +209,13 @@ _binop(PyObject *self, PyObject *args) {
     }
 
     if (!PyCapsule_IsValid(op, MATH_FUNC_BINOP_MAGIC)) {
-        PyErr_Format(
-            PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_BINOP_MAGIC
-        );
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_BINOP_MAGIC);
         return NULL;
     }
     if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) ||
         !PyCapsule_IsValid(i1, IMAGING_MAGIC) ||
         !PyCapsule_IsValid(i2, IMAGING_MAGIC)) {
-        PyErr_Format(
-            PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC
-        );
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }
 

diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c
@@ -48,9 +48,7 @@ apply(PyObject *self, PyObject *args) {
 
     if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) ||
         !PyCapsule_IsValid(i1, IMAGING_MAGIC)) {
-        PyErr_Format(
-            PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC
-        );
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }
 
@@ -143,9 +141,7 @@ match(PyObject *self, PyObject *args) {
     }
 
     if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) {
-        PyErr_Format(
-            PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC
-        );
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }
 
@@ -218,9 +214,7 @@ get_on_pixels(PyObject *self, PyObject *args) {
     }
 
     if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) {
-        PyErr_Format(
-            PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC
-        );
+        PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);
         return NULL;
     }