rename PyCapsule -> Capsule

homm · homm · commit 4eb58da82059 · 2024-09-03T11:54:24.000+04:00
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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,7 @@ ImagingFind(const char *name) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if (!PyCapsule_IsValid(capsule, IMAGING_MAGIC)) {`
`82`		`- PyErr_Format(`
`83`		`- PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC`
`84`		`- );`
	`82`	`+ PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);`
`85`	`83`	`return NULL;`
`86`	`84`	`}`
`87`	`85`
Original file line number	Diff line number	Diff line change
`@@ -541,9 +541,7 @@ cms_transform_apply(CmsTransformObject self, PyObject args) {`
`541`	`541`
`542`	`542`	`if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) \|\|`
`543`	`543`	`!PyCapsule_IsValid(i1, IMAGING_MAGIC)) {`
`544`		`- PyErr_Format(`
`545`		`- PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC`
`546`		`- );`
	`544`	`+ PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);`
`547`	`545`	`return NULL;`
`548`	`546`	`}`
`549`	`547`
Original file line number	Diff line number	Diff line change
`@@ -177,16 +177,12 @@ _unop(PyObject self, PyObject args) {`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`if (!PyCapsule_IsValid(op, MATH_FUNC_UNOP_MAGIC)) {`
`180`		`- PyErr_Format(`
`181`		`- PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_UNOP_MAGIC`
`182`		`- );`
	`180`	`+ PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_UNOP_MAGIC);`
`183`	`181`	`return NULL;`
`184`	`182`	`}`
`185`	`183`	`if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) \|\|`
`186`	`184`	`!PyCapsule_IsValid(i1, IMAGING_MAGIC)) {`
`187`		`- PyErr_Format(`
`188`		`- PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC`
`189`		`- );`
	`185`	`+ PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);`
`190`	`186`	`return NULL;`
`191`	`187`	`}`
`192`	`188`
`@@ -213,17 +209,13 @@ _binop(PyObject self, PyObject args) {`
`213`	`209`	`}`
`214`	`210`
`215`	`211`	`if (!PyCapsule_IsValid(op, MATH_FUNC_BINOP_MAGIC)) {`
`216`		`- PyErr_Format(`
`217`		`- PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_BINOP_MAGIC`
`218`		`- );`
	`212`	`+ PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_BINOP_MAGIC);`
`219`	`213`	`return NULL;`
`220`	`214`	`}`
`221`	`215`	`if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) \|\|`
`222`	`216`	`!PyCapsule_IsValid(i1, IMAGING_MAGIC) \|\|`
`223`	`217`	`!PyCapsule_IsValid(i2, IMAGING_MAGIC)) {`
`224`		`- PyErr_Format(`
`225`		`- PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC`
`226`		`- );`
	`218`	`+ PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);`
`227`	`219`	`return NULL;`
`228`	`220`	`}`
`229`	`221`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,7 @@ apply(PyObject self, PyObject args) {`
`48`	`48`
`49`	`49`	`if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) \|\|`
`50`	`50`	`!PyCapsule_IsValid(i1, IMAGING_MAGIC)) {`
`51`		`- PyErr_Format(`
`52`		`- PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC`
`53`		`- );`
	`51`	`+ PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);`
`54`	`52`	`return NULL;`
`55`	`53`	`}`
`56`	`54`
`@@ -143,9 +141,7 @@ match(PyObject self, PyObject args) {`
`143`	`141`	`}`
`144`	`142`
`145`	`143`	`if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) {`
`146`		`- PyErr_Format(`
`147`		`- PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC`
`148`		`- );`
	`144`	`+ PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);`
`149`	`145`	`return NULL;`
`150`	`146`	`}`
`151`	`147`
`@@ -218,9 +214,7 @@ get_on_pixels(PyObject self, PyObject args) {`
`218`	`214`	`}`
`219`	`215`
`220`	`216`	`if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) {`
`221`		`- PyErr_Format(`
`222`		`- PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC`
`223`		`- );`
	`217`	`+ PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC);`
`224`	`218`	`return NULL;`
`225`	`219`	`}`
`226`	`220`