From bf11639626373bd27a80f790d56101d4b4e2f1c6 Mon Sep 17 00:00:00 2001
From: Aleksandr Karpinskii <homm86@gmail.com>
Date: Tue, 3 Sep 2024 11:54:24 +0400
Subject: [PATCH] rename PyCapsule -> Capsule

---
 docs/deprecations.rst |  2 +-
 src/Tk/tkImaging.c    |  4 +---
 src/_imagingcms.c     |  4 +---
 src/_imagingmath.c    | 16 ++++------------
 src/_imagingmorph.c   | 12 +++---------
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/docs/deprecations.rst b/docs/deprecations.rst
index 5bb0ebf58..93bd51ef1 100644
--- 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
index b33a47d30..a36c3e0bd 100644
--- 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
index 444b6a602..1823bcf03 100644
--- 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
index eafcf1444..dbe636707 100644
--- 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
index 715cccf51..637295be7 100644
--- 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;
     }