Merge pull request #7667 from nulano/iptc

Fix loading IPTC images and update test

Tests/test_file_iptc.py

@@ -6,18 +6,21 @@ import pytest
 
 from PIL import Image, IptcImagePlugin
 
-from .helper import hopper
+from .helper import assert_image_equal, hopper
 
 TEST_FILE = "Tests/images/iptc.jpg"
 
 
 def test_open():
+    expected = Image.new("L", (1, 1))
+
     f = BytesIO(
-        b"\x1c\x03<\x00\x02\x01\x00\x1c\x03x\x00\x01\x01\x1c"
-        b"\x03\x14\x00\x01\x01\x1c\x03\x1e\x00\x01\x01\x1c\x08\n\x00\x00"
+        b"\x1c\x03<\x00\x02\x01\x00\x1c\x03x\x00\x01\x01\x1c\x03\x14\x00\x01\x01"
+        b"\x1c\x03\x1e\x00\x01\x01\x1c\x08\n\x00\x01\x00"
     )
     with Image.open(f) as im:
         assert im.tile == [("iptc", (0, 0, 1, 1), 25, "raw")]
+        assert_image_equal(im, expected)
 
 
 def test_getiptcinfo_jpg_none():

src/PIL/IptcImagePlugin.py

@@ -16,8 +16,7 @@
 #
 from __future__ import annotations
 
-import os
-import tempfile
+from io import BytesIO
 from typing import Sequence
 
 from . import Image, ImageFile
@@ -158,12 +157,11 @@ class IptcImageFile(ImageFile.ImageFile):
         self.fp.seek(offset)
 
         # Copy image data to temporary file
-        o_fd, outfile = tempfile.mkstemp(text=False)
-        o = os.fdopen(o_fd)
+        o = BytesIO()
         if compression == "raw":
             # To simplify access to the extracted file,
             # prepend a PPM header
-            o.write("P5\n%d %d\n255\n" % self.size)
+            o.write(b"P5\n%d %d\n255\n" % self.size)
         while True:
             type, size = self.field()
             if type != (8, 10):
@@ -174,17 +172,10 @@ class IptcImageFile(ImageFile.ImageFile):
                     break
                 o.write(s)
                 size -= len(s)
-        o.close()
 
-        try:
-            with Image.open(outfile) as _im:
+        with Image.open(o) as _im:
             _im.load()
             self.im = _im.im
-        finally:
-            try:
-                os.unlink(outfile)
-            except OSError:
-                pass
 
 
 Image.register_open(IptcImageFile.format, IptcImageFile)
@@ -200,8 +191,6 @@ def getiptcinfo(im):
     :returns: A dictionary containing IPTC information, or None if
         no IPTC information block was found.
     """
-    import io
-
     from . import JpegImagePlugin, TiffImagePlugin
 
     data = None
@@ -236,7 +225,7 @@ def getiptcinfo(im):
 
     # parse the IPTC information chunk
     im.info = {}
-    im.fp = io.BytesIO(data)
+    im.fp = BytesIO(data)
 
     try:
         im._open()