Use context managers to ensure Pillow images are closed

src/ocrmypdf/_pipeline.py

@@ -54,9 +54,9 @@ def triage_image_file(input_file, output_file, options, log):
         # Recover the original filename
         log.error(str(e).replace(input_file, options.input_file))
         raise UnsupportedImageFormatError() from e
-    else:
-        log.info("Input file is an image")
 
+    with im:
+        log.info("Input file is an image")
         if 'dpi' in im.info:
             if im.info['dpi'] <= (96, 96) and not options.image_dpi:
                 log.info("Image size: (%d, %d)" % im.size)
@@ -89,7 +89,6 @@ def triage_image_file(input_file, output_file, options, log):
             elif im.mode == 'CMYK':
                 log.info('Input CMYK image has no ICC profile, not usable')
                 raise UnsupportedImageFormatError()
-        im.close()
 
     try:
         log.info("Image seems valid. Try converting to PDF...")

src/ocrmypdf/exec/pngquant.py

@@ -40,8 +40,7 @@ def available():
 
 def quantize(input_file, output_file, quality_min, quality_max):
     if input_file.endswith('.jpg'):
-        im = Image.open(input_file)
-        with NamedTemporaryFile(suffix='.png') as tmp:
+        with Image.open(input_file) as im, NamedTemporaryFile(suffix='.png') as tmp:
             im.save(tmp)
             args = [
                 'pngquant',

src/ocrmypdf/exec/tesseract.py

@@ -233,8 +233,8 @@ def _generate_null_hocr(output_hocr, output_sidecar, image):
     the same size as the input image."""
     from PIL import Image
 
-    im = Image.open(image)
-    w, h = im.size
+    with Image.open(image) as im:
+        w, h = im.size
 
     with open(output_hocr, 'w', encoding="utf-8") as f:
         f.write(HOCR_TEMPLATE.format(w, h))

src/ocrmypdf/exec/unpaper.py

@@ -42,33 +42,30 @@ def run(input_file, output_file, dpi, log, mode_args):
 
     SUFFIXES = {'1': '.pbm', 'L': '.pgm', 'RGB': '.ppm'}
 
-    im = Image.open(input_file)
-    if im.mode not in SUFFIXES.keys():
-        log.info("Converting image to other colorspace")
+    with TemporaryDirectory() as tmpdir, Image.open(input_file) as im:
+        if im.mode not in SUFFIXES.keys():
+            log.info("Converting image to other colorspace")
+            try:
+                if im.mode == 'P' and len(im.getcolors()) == 2:
+                    im = im.convert(mode='1')
+                else:
+                    im = im.convert(mode='RGB')
+            except IOError as e:
+                im.close()
+                raise MissingDependencyError(
+                    "Could not convert image with type " + im.mode
+                ) from e
+
         try:
-            if im.mode == 'P' and len(im.getcolors()) == 2:
-                im = im.convert(mode='1')
-            else:
-                im = im.convert(mode='RGB')
-        except IOError as e:
-            im.close()
+            suffix = SUFFIXES[im.mode]
+        except KeyError:
             raise MissingDependencyError(
-                "Could not convert image with type " + im.mode
+                "Failed to convert image to a supported format."
             ) from e
 
-    try:
-        suffix = SUFFIXES[im.mode]
-    except KeyError:
-        im.close()
-        raise MissingDependencyError(
-            "Failed to convert image to a supported format."
-        ) from e
-
-    with TemporaryDirectory() as tmpdir:
         input_pnm = os.path.join(tmpdir, f'input{suffix}')
         output_pnm = os.path.join(tmpdir, f'output{suffix}')
         im.save(input_pnm, format='PPM')
-        im.close()
 
         # To prevent any shenanigans from accepting arbitrary parameters in
         # --unpaper-args, we:
@@ -95,10 +92,12 @@ def run(input_file, output_file, dpi, log, mode_args):
             log.debug(proc.stdout)
             # unpaper sets dpi to 72; fix this
             try:
-                Image.open(output_pnm).save(output_file, dpi=(dpi, dpi))
+                with Image.open(output_pnm) as imout:
+                    imout.save(output_file, dpi=(dpi, dpi))
             except (FileNotFoundError, OSError):
                 raise SubprocessOutputError(
-                    "unpaper: failed to produce the expected output file. Called with: "
+                    "unpaper: failed to produce the expected output file. "
+                    + " Called with: "
                     + str(args_unpaper)
                 ) from None