diff --git a/.travis.yml b/.travis.yml index 564cb37..8f18940 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ matrix: - netpbm - ghostscript - mupdf-tools - - icc-profiles-free - name: "python 3.9 Windows" os: windows language: shell # 'language: python' is an error on Travis CI Windows diff --git a/src/img2pdf_test.py b/src/img2pdf_test.py index 33252c8..6e866be 100755 --- a/src/img2pdf_test.py +++ b/src/img2pdf_test.py @@ -20,6 +20,21 @@ import warnings import json import pathlib +ICC_PROFILE = None +ICC_PROFILE_PATHS = ( + # Debian + "/usr/share/color/icc/ghostscript/srgb.icc", + # Fedora + "/usr/share/ghostscript/iccprofiles/srgb.icc", + # Archlinux and Gentoo + "/usr/share/ghostscript/*/iccprofiles/srgb.icc", +) +for glob in ICC_PROFILE_PATHS: + for path in pathlib.Path("/").glob(glob.lstrip("/")): + if path.is_file(): + ICC_PROFILE = path + break + HAVE_MUTOOL = True try: ver = subprocess.check_output(["mutool", "-v"], stderr=subprocess.STDOUT) @@ -304,11 +319,9 @@ def compare(im1, im2, exact, icc, cmyk): else: iccargs = [] if icc: - profile = "/usr/share/color/icc/sRGB.icc" - if not os.path.isfile(profile): - warnings.warn(profile + " not present, skipping checks...") - return - iccargs = ["-profile", profile] + if ICC_PROFILE is None: + pytest.skip("Could not locate an ICC profile") + iccargs = ["-profile", ICC_PROFILE] psnr = subprocess.run( ["compare"] + iccargs @@ -421,10 +434,8 @@ def compare_pdfimages_png(tmpdir, img, pdf, exact=True, icc=False): ) else: if icc: - profile = "/usr/share/color/icc/ghostscript/srgb.icc" - if not os.path.isfile(profile): - warnings.warn(profile + " not present, skipping checks...") - return + if ICC_PROFILE is None: + pytest.skip("Could not locate an ICC profile") psnr = subprocess.run( [ "compare", @@ -432,7 +443,7 @@ def compare_pdfimages_png(tmpdir, img, pdf, exact=True, icc=False): "PSNR", "(", "-profile", - profile, + ICC_PROFILE, "-depth", "8", str(img), diff --git a/src/img2pdf_test.py.rej b/src/img2pdf_test.py.rej new file mode 100644 index 0000000..34fe2f3 --- /dev/null +++ b/src/img2pdf_test.py.rej @@ -0,0 +1,850 @@ +--- src/img2pdf_test.py ++++ src/img2pdf_test.py +@@ -1146,7 +1146,6 @@ def png_rgb8_img(tmp_normal_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" + ), str(identify) +@@ -1196,7 +1195,6 @@ def png_rgb16_img(tmp_normal16_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") + == "16" +@@ -1250,7 +1248,6 @@ def png_rgba8_img(tmp_path_factory, tmp_alpha_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" + ), str(identify) +@@ -1301,7 +1298,6 @@ def png_rgba16_img(tmp_alpha_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") + == "16" +@@ -1368,7 +1364,6 @@ def png_gray8a_img(tmp_path_factory, tmp_alpha_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" + ), str(identify) +@@ -1431,7 +1426,6 @@ def png_gray16a_img(tmp_path_factory, tmp_alpha_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") + == "16" +@@ -1486,7 +1480,6 @@ def png_interlaced_img(tmp_path_factory, tmp_normal_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" + ), str(identify) +@@ -1538,7 +1531,6 @@ def png_gray1_img(tmp_path_factory, tmp_gray1_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "1" + ), str(identify) +@@ -1589,7 +1581,6 @@ def png_gray2_img(tmp_path_factory, tmp_gray2_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "2" + ), str(identify) +@@ -1640,7 +1631,6 @@ def png_gray4_img(tmp_path_factory, tmp_gray4_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "4" + ), str(identify) +@@ -1691,7 +1681,6 @@ def png_gray8_img(tmp_path_factory, tmp_gray8_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" + ), str(identify) +@@ -1742,7 +1731,6 @@ def png_gray16_img(tmp_path_factory, tmp_gray16_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") + == "16" +@@ -1794,7 +1782,6 @@ def png_palette1_img(tmp_path_factory, tmp_palette1_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "1" + ), str(identify) +@@ -1845,7 +1832,6 @@ def png_palette2_img(tmp_path_factory, tmp_palette2_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "2" + ), str(identify) +@@ -1896,7 +1882,6 @@ def png_palette4_img(tmp_path_factory, tmp_palette4_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "4" + ), str(identify) +@@ -1947,7 +1932,6 @@ def png_palette8_img(tmp_path_factory, tmp_palette8_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" + ), str(identify) +@@ -2257,7 +2241,6 @@ def tiff_float_img(tmp_path_factory, tmp_normal_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("quantum:format") + == "floating-point" +@@ -2310,7 +2293,6 @@ def tiff_cmyk8_img(tmp_path_factory, tmp_normal_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2368,7 +2350,6 @@ def tiff_cmyk16_img(tmp_path_factory, tmp_normal_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2416,7 +2397,6 @@ def tiff_rgb8_img(tmp_path_factory, tmp_normal_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2469,7 +2449,6 @@ def tiff_rgb12_img(tmp_path_factory, tmp_normal16_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2522,7 +2501,6 @@ def tiff_rgb14_img(tmp_path_factory, tmp_normal16_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2571,7 +2549,6 @@ def tiff_rgb16_img(tmp_path_factory, tmp_normal16_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2620,7 +2597,6 @@ def tiff_rgba8_img(tmp_path_factory, tmp_alpha_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unassociated" + ), str(identify) +@@ -2669,7 +2645,6 @@ def tiff_rgba16_img(tmp_path_factory, tmp_alpha_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unassociated" + ), str(identify) +@@ -2716,7 +2691,6 @@ def tiff_gray1_img(tmp_path_factory, tmp_gray1_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2764,7 +2738,6 @@ def tiff_gray2_img(tmp_path_factory, tmp_gray2_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2812,7 +2785,6 @@ def tiff_gray4_img(tmp_path_factory, tmp_gray4_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2860,7 +2832,6 @@ def tiff_gray8_img(tmp_path_factory, tmp_gray8_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2908,7 +2879,6 @@ def tiff_gray16_img(tmp_path_factory, tmp_gray16_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -2960,7 +2930,6 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -3001,7 +2970,6 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -3051,7 +3019,6 @@ def tiff_palette1_img(tmp_path_factory, tmp_palette1_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -3100,7 +3067,6 @@ def tiff_palette2_img(tmp_path_factory, tmp_palette2_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -3149,7 +3115,6 @@ def tiff_palette4_img(tmp_path_factory, tmp_palette4_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -3197,7 +3162,6 @@ def tiff_palette8_img(tmp_path_factory, tmp_palette8_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("tiff:alpha") == "unspecified" + ), str(identify) +@@ -3727,7 +3691,6 @@ def png_icc_img(tmp_icc_png): + "x": 0, + "y": 0, + }, str(identify) +- assert identify[0]["image"].get("compression") == "Zip", str(identify) + assert ( + identify[0]["image"].get("properties", {}).get("png:IHDR.bit-depth-orig") == "8" + ), str(identify) +--- src/img2pdf_test.py ++++ src/img2pdf_test.py +@@ -968,10 +968,6 @@ def jpg_img(tmp_path_factory, tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "JPEG", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "Joint Photographic Experts Group JFIF format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/jpeg", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1028,10 +1024,6 @@ def jpg_rot_img(tmp_path_factory, tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "JPEG", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "Joint Photographic Experts Group JFIF format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/jpeg", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1071,10 +1063,6 @@ def jpg_cmyk_img(tmp_path_factory, tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "JPEG", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "Joint Photographic Experts Group JFIF format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/jpeg", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1109,9 +1097,6 @@ def jpg_2000_img(tmp_path_factory, tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "JP2", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "JPEG-2000 File Format Syntax" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/jp2", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1145,9 +1130,6 @@ def png_rgb8_img(tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1198,9 +1180,6 @@ def png_rgb16_img(tmp_normal16_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1255,9 +1234,6 @@ def png_rgba8_img(tmp_path_factory, tmp_alpha_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1309,9 +1285,6 @@ def png_rgba16_img(tmp_alpha_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1379,9 +1352,6 @@ def png_gray8a_img(tmp_path_factory, tmp_alpha_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1445,9 +1415,6 @@ def png_gray16a_img(tmp_path_factory, tmp_alpha_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1503,9 +1470,6 @@ def png_interlaced_img(tmp_path_factory, tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1558,9 +1522,6 @@ def png_gray1_img(tmp_path_factory, tmp_gray1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1612,9 +1573,6 @@ def png_gray2_img(tmp_path_factory, tmp_gray2_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1666,9 +1624,6 @@ def png_gray4_img(tmp_path_factory, tmp_gray4_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1720,9 +1675,6 @@ def png_gray8_img(tmp_path_factory, tmp_gray8_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1774,9 +1726,6 @@ def png_gray16_img(tmp_path_factory, tmp_gray16_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1829,9 +1778,6 @@ def png_palette1_img(tmp_path_factory, tmp_palette1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1883,9 +1829,6 @@ def png_palette2_img(tmp_path_factory, tmp_palette2_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1937,9 +1880,6 @@ def png_palette4_img(tmp_path_factory, tmp_palette4_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -1991,9 +1931,6 @@ def png_palette8_img(tmp_path_factory, tmp_palette8_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2045,10 +1982,6 @@ def gif_transparent_img(tmp_path_factory, tmp_alpha_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "GIF", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "CompuServe graphics interchange format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2084,10 +2017,6 @@ def gif_palette1_img(tmp_path_factory, tmp_palette1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "GIF", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "CompuServe graphics interchange format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2123,10 +2052,6 @@ def gif_palette2_img(tmp_path_factory, tmp_palette2_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "GIF", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "CompuServe graphics interchange format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2162,10 +2087,6 @@ def gif_palette4_img(tmp_path_factory, tmp_palette4_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "GIF", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "CompuServe graphics interchange format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2201,10 +2122,6 @@ def gif_palette8_img(tmp_path_factory, tmp_palette8_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "GIF", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "CompuServe graphics interchange format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2244,10 +2161,6 @@ def gif_animation_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "GIF", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "CompuServe graphics interchange format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2277,10 +2190,6 @@ def gif_animation_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "GIF", str(identify) +- assert ( +- identify[0]["image"]["formatDescription"] +- == "CompuServe graphics interchange format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/gif", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2327,9 +2236,6 @@ def tiff_float_img(tmp_path_factory, tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2384,9 +2290,6 @@ def tiff_cmyk8_img(tmp_path_factory, tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2445,9 +2348,6 @@ def tiff_cmyk16_img(tmp_path_factory, tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2496,9 +2396,6 @@ def tiff_rgb8_img(tmp_path_factory, tmp_normal_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2548,9 +2445,6 @@ def tiff_rgb12_img(tmp_path_factory, tmp_normal16_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2604,9 +2498,6 @@ def tiff_rgb14_img(tmp_path_factory, tmp_normal16_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2660,9 +2551,6 @@ def tiff_rgb16_img(tmp_path_factory, tmp_normal16_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2712,9 +2600,6 @@ def tiff_rgba8_img(tmp_path_factory, tmp_alpha_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2764,9 +2649,6 @@ def tiff_rgba16_img(tmp_path_factory, tmp_alpha_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2814,9 +2696,6 @@ def tiff_gray1_img(tmp_path_factory, tmp_gray1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2865,9 +2744,6 @@ def tiff_gray2_img(tmp_path_factory, tmp_gray2_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2916,9 +2792,6 @@ def tiff_gray4_img(tmp_path_factory, tmp_gray4_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -2967,9 +2840,6 @@ def tiff_gray8_img(tmp_path_factory, tmp_gray8_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3018,9 +2888,6 @@ def tiff_gray16_img(tmp_path_factory, tmp_gray16_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3073,9 +2940,6 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3117,9 +2981,6 @@ def tiff_multipage_img(tmp_path_factory, tmp_normal_png, tmp_inverse_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3168,9 +3029,6 @@ def tiff_palette1_img(tmp_path_factory, tmp_palette1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3220,9 +3078,6 @@ def tiff_palette2_img(tmp_path_factory, tmp_palette2_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3272,9 +3127,6 @@ def tiff_palette4_img(tmp_path_factory, tmp_palette4_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3324,9 +3176,6 @@ def tiff_palette8_img(tmp_path_factory, tmp_palette8_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3389,9 +3238,6 @@ def tiff_ccitt_lsb_m2l_white_img(tmp_path_factory, tmp_gray1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3471,9 +3317,6 @@ def tiff_ccitt_msb_m2l_white_img(tmp_path_factory, tmp_gray1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3554,9 +3397,6 @@ def tiff_ccitt_msb_l2m_white_img(tmp_path_factory, tmp_gray1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3642,9 +3482,6 @@ def tiff_ccitt_lsb_m2l_black_img(tmp_path_factory, tmp_gray1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3733,9 +3570,6 @@ def tiff_ccitt_nometa1_img(tmp_path_factory, tmp_gray1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3818,9 +3652,6 @@ def tiff_ccitt_nometa2_img(tmp_path_factory, tmp_gray1_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "TIFF", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Tagged Image File Format" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/tiff", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60, +@@ -3880,9 +3711,6 @@ def png_icc_img(tmp_icc_png): + identify = [identify] + assert "image" in identify[0] + assert identify[0]["image"].get("format") == "PNG", str(identify) +- assert ( +- identify[0]["image"].get("formatDescription") == "Portable Network Graphics" +- ), str(identify) + assert identify[0]["image"].get("mimeType") == "image/png", str(identify) + assert identify[0]["image"].get("geometry") == { + "width": 60,