_imaging module cleanup

Tests/test_image_access.py

@@ -282,7 +282,7 @@ def test_embeddable(self) -> None:
             home = sys.prefix.replace("\\", "\\\\")
             fh.write(
                 f"""
-#include "Python.h"
+#include <Python.h>
 
 int main(int argc, char* argv[])
 {{

setup.py

@@ -347,7 +347,6 @@ def __iter__(self) -> Iterator[str]:
             ("disable-platform-guessing", None, "Disable platform guessing"),
             ("debug", None, "Debug logging"),
         ]
-        + [("add-imaging-libs=", None, "Add libs to _imaging build")]
     )
 
     @staticmethod
@@ -358,7 +357,6 @@ def initialize_options(self) -> None:
         self.disable_platform_guessing = self.check_configuration(
             "platform-guessing", "disable"
         )
-        self.add_imaging_libs = ""
         build_ext.initialize_options(self)
         for x in self.feature:
             setattr(self, f"disable_{x}", self.check_configuration(x, "disable"))
@@ -855,7 +853,6 @@ def build_extensions(self) -> None:
         # core library
 
         libs: list[str | bool | None] = []
-        libs.extend(self.add_imaging_libs.split())
         defs: list[tuple[str, str | None]] = []
         if feature.get("tiff"):
             libs.append(feature.get("tiff"))

src/PIL/ImageTk.py

@@ -181,7 +181,7 @@ def paste(self, im: Image.Image) -> None:
         image = im.im
         if not image.isblock() or im.mode != self.__mode:
             block = Image.core.new_block(self.__mode, im.size)
-            image.convert2(block, image)  # convert directly between buffers
+            image.convert2(block)  # convert directly between buffers
             ptr = block.ptr
 
         _pyimagingtkcall("PyImagingPhoto", self.__photo, ptr)

src/Tk/tkImaging.c

@@ -243,13 +243,9 @@
      * Set Python exception if we can't find `func_name` in `lib_handle`.
      * Returns function pointer or NULL if not present.
      */
-
-    char message[100];
-
     FARPROC func = GetProcAddress(lib_handle, func_name);
     if (func == NULL) {
-        sprintf(message, "Cannot load function %s", func_name);
-        PyErr_SetString(PyExc_RuntimeError, message);
+        PyErr_Format(PyExc_RuntimeError, "Cannot load function %s", func_name);
     }
     return func;
 }