From 36cea1953231d71f1184ef1396c1f01ff11c939a Mon Sep 17 00:00:00 2001
From: Andrew Murray <3112309+radarhere@users.noreply.github.com>
Date: Tue, 10 Jun 2025 21:08:29 +1000
Subject: [PATCH] Do not decode bytes in PPM error message (#8958)

---
 Tests/test_file_ppm.py    | 7 ++++---
 src/PIL/PpmImagePlugin.py | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py
index 41e2b5416..c7d1f4df4 100644
--- a/Tests/test_file_ppm.py
+++ b/Tests/test_file_ppm.py
@@ -288,12 +288,13 @@ def test_non_integer_token(tmp_path: Path) -> None:
             pass
 
 
-def test_header_token_too_long(tmp_path: Path) -> None:
+@pytest.mark.parametrize("data", (b"P3\x0cAAAAAAAAAA\xee", b"P6\n 01234567890"))
+def test_header_token_too_long(tmp_path: Path, data: bytes) -> None:
     path = tmp_path / "temp.ppm"
     with open(path, "wb") as f:
-        f.write(b"P6\n 01234567890")
+        f.write(data)
 
-    with pytest.raises(ValueError, match="Token too long in file header: 01234567890"):
+    with pytest.raises(ValueError, match="Token too long in file header: "):
         with Image.open(path):
             pass
 
diff --git a/src/PIL/PpmImagePlugin.py b/src/PIL/PpmImagePlugin.py
index 03afa2d2e..db34d107a 100644
--- a/src/PIL/PpmImagePlugin.py
+++ b/src/PIL/PpmImagePlugin.py
@@ -94,8 +94,8 @@ class PpmImageFile(ImageFile.ImageFile):
             msg = "Reached EOF while reading header"
             raise ValueError(msg)
         elif len(token) > 10:
-            msg = f"Token too long in file header: {token.decode()}"
-            raise ValueError(msg)
+            msg_too_long = b"Token too long in file header: %s" % token
+            raise ValueError(msg_too_long)
         return token
 
     def _open(self) -> None: