Merge branch 'main' into fix-docs-typos-grammar

Author: him2him2

.github/workflows/wheels-dependencies.sh

@@ -96,7 +96,7 @@ else
   FREETYPE_VERSION=2.14.1
 fi
 HARFBUZZ_VERSION=12.3.2
-LIBPNG_VERSION=1.6.54
+LIBPNG_VERSION=1.6.55
 JPEGTURBO_VERSION=3.1.3
 OPENJPEG_VERSION=2.5.4
 XZ_VERSION=5.8.2

.pre-commit-config.yaml

@@ -38,6 +38,7 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:
+      - id: check-case-conflict
       - id: check-executables-have-shebangs
       - id: check-shebang-scripts-are-executable
       - id: check-merge-conflict

Tests/test_imagepalette.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from io import BytesIO
+import io
 from pathlib import Path
 
 import pytest
@@ -23,6 +23,13 @@ def test_reload() -> None:
         assert_image_equal(im.convert("RGB"), original.convert("RGB"))
 
 
+def test_save_fp() -> None:
+    palette = ImagePalette.ImagePalette()
+    with io.StringIO() as fp:
+        palette.save(fp)
+        assert not fp.closed
+
+
 def test_getcolor() -> None:
     palette = ImagePalette.ImagePalette()
     assert len(palette.palette) == 0
@@ -204,7 +211,7 @@ def test_2bit_palette(tmp_path: Path) -> None:
 
 
 def test_getpalette() -> None:
-    b = BytesIO(b"0 1\n1 2 3 4")
+    b = io.BytesIO(b"0 1\n1 2 3 4")
     p = PaletteFile.PaletteFile(b)
 
     palette, rawmode = p.getpalette()
@@ -216,6 +223,6 @@ def test_invalid_palette() -> None:
     with pytest.raises(OSError):
         ImagePalette.load("Tests/images/hopper.jpg")
 
-    b = BytesIO(b"1" * 101)
+    b = io.BytesIO(b"1" * 101)
     with pytest.raises(SyntaxError, match="bad palette file"):
         PaletteFile.PaletteFile(b)

src/PIL/ImagePalette.py

@@ -191,19 +191,24 @@ def save(self, fp: str | IO[str]) -> None:
         if self.rawmode:
             msg = "palette contains raw palette data"
             raise ValueError(msg)
+        open_fp = False
         if isinstance(fp, str):
             fp = open(fp, "w")
-        fp.write("# Palette\n")
-        fp.write(f"# Mode: {self.mode}\n")
-        for i in range(256):
-            fp.write(f"{i}")
-            for j in range(i * len(self.mode), (i + 1) * len(self.mode)):
-                try:
-                    fp.write(f" {self.palette[j]}")
-                except IndexError:
-                    fp.write(" 0")
-            fp.write("\n")
-        fp.close()
+            open_fp = True
+        try:
+            fp.write("# Palette\n")
+            fp.write(f"# Mode: {self.mode}\n")
+            for i in range(256):
+                fp.write(f"{i}")
+                for j in range(i * len(self.mode), (i + 1) * len(self.mode)):
+                    try:
+                        fp.write(f" {self.palette[j]}")
+                    except IndexError:
+                        fp.write(" 0")
+                fp.write("\n")
+        finally:
+            if open_fp:
+                fp.close()
 
 
 # --------------------------------------------------------------------

winbuild/build_prepare.py

@@ -121,7 +121,7 @@ def cmd_msbuild(
     "LCMS2": "2.18",
     "LIBAVIF": "1.3.0",
     "LIBIMAGEQUANT": "4.4.1",
-    "LIBPNG": "1.6.54",
+    "LIBPNG": "1.6.55",
     "LIBWEBP": "1.6.0",
     "OPENJPEG": "2.5.4",
     "TIFF": "4.7.1",