Merge pull request #1 from radarhere/init

rrcgat · web-flow · commit 5a0c431c46d9 · 2023-04-21T08:14:45.000+08:00
Call init() if mimetype is not found with preinit()
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -84,13 +84,7 @@ jobs:
           python3 -m pip install pytest-reverse
         fi
         if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
-          export XDG_RUNTIME_DIR="/tmp/headless-sway"
-          export SWAYSOCK="$XDG_RUNTIME_DIR/sway.sock"
-          export WLR_BACKENDS=headless
-          export WLR_LIBINPUT_NO_DEVICES=1
-          mkdir "$XDG_RUNTIME_DIR"
-          xvfb-run -s '-screen 0 1024x768x24'\
-                  sway -V -d -c /dev/null&
+          xvfb-run -s '-screen 0 1024x768x24' sway&
           export WAYLAND_DISPLAY=wayland-1
           .ci/test.sh
         else
diff --git a/Tests/test_imagegrab.py b/Tests/test_imagegrab.py
@@ -106,11 +106,10 @@ def test_grabclipboard_png(self):
         ),
         reason="Linux with wl-clipboard only",
     )
-    @pytest.mark.parametrize(
-        "image_path", ["Tests/images/hopper.gif", "Tests/images/hopper.png"]
-    )
-    def test_grabclipboard_wl_clipboard(self, image_path):
-        with open(image_path, mode="rb") as raw_image:
-            subprocess.call(["wl-copy"], stdin=raw_image)
+    @pytest.mark.parametrize("ext", ("gif", "png", "ico"))
+    def test_grabclipboard_wl_clipboard(self, ext):
+        image_path = "Tests/images/hopper." + ext
+        with open(image_path, "rb") as fp:
+            subprocess.call(["wl-copy"], stdin=fp)
             im = ImageGrab.grabclipboard()
             assert_image_equal_tofile(im, image_path)
diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py
@@ -137,11 +137,19 @@ def grabclipboard():
             args = ["wl-paste"]
             output = subprocess.check_output(["wl-paste", "-l"]).decode()
             clipboard_mimetypes = output.splitlines()
+
+            def find_mimetype():
+                for mime in Image.MIME.values():
+                    if mime in clipboard_mimetypes:
+                        return mime
+
             Image.preinit()
-            for mimetype in Image.MIME.values():
-                if mimetype in clipboard_mimetypes:
-                    args.extend(["-t", mimetype])
-                    break
+            mimetype = find_mimetype()
+            if not mimetype:
+                Image.init()
+                mimetype = find_mimetype()
+            if mimetype:
+                args.extend(["-t", mimetype])
         elif shutil.which("xclip"):
             args = ["xclip", "-selection", "clipboard", "-t", "image/png", "-o"]
         else:
