Merge pull request #3 from radarhere/grabclipboard

Added test

Author: nik012003

Tests/test_imagegrab.py

@@ -119,3 +119,15 @@ def test_grabclipboard_wl_clipboard(self, ext):
             subprocess.call(["wl-copy"], stdin=fp)
         im = ImageGrab.grabclipboard()
         assert_image_equal_tofile(im, image_path)
+
+    @pytest.mark.skipif(
+        (
+            sys.platform != "linux"
+            or not all(shutil.which(cmd) for cmd in ("wl-paste", "wl-copy"))
+        ),
+        reason="Linux with wl-clipboard only",
+    )
+    @pytest.mark.parametrize("arg", ("text", "--clear"))
+    def test_grabclipboard_wl_clipboard_errors(self, arg):
+        subprocess.call(["wl-copy", arg])
+        assert ImageGrab.grabclipboard() is None

src/PIL/ImageGrab.py

@@ -162,14 +162,18 @@ def grabclipboard():
             for silent_error in [
                 # wl-paste, when the clipboard is empty
                 b"Nothing is copied",
-                # wl-paste/debian xclip, when an image isn't available
-                b"not available",
+                # Ubuntu/Debian wl-paste, when the clipboard is empty
+                b"No selection",
+                # Ubuntu/Debian wl-paste, when an image isn't available
+                b"No suitable type of content copied",
+                # wl-paste or Ubuntu/Debian xclip, when an image isn't available
+                b" not available",
                 # xclip, when an image isn't available
-                b"cannot convert",
+                b"cannot convert ",
                 # xclip, when the clipboard isn't initialized
-                b"There is no owner",
+                b"xclip: Error: There is no owner for the ",
             ]:
-                if err in silent_error:
+                if silent_error in err:
                     return None
             msg = f"{args[0]} error"
             if err: