Merge pull request #1 from radarhere/grabclipboard

nik012003 · web-flow · commit 1522b3fb84f7 · 2024-01-27T11:04:43.000+01:00
Rearranged code
diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py
@@ -157,17 +157,21 @@ def grabclipboard():
             raise NotImplementedError(msg)
 
         p = subprocess.run(args, capture_output=True)
-        err = p.stderr.decode()
         if p.returncode != 0:
             allowed_errors = [
-                "Nothing is copied",  # wl-paste, when the clipboard is empty
-                "not available",  # wl-paste/debian xclip, when an image isn't available
-                "cannot convert",  # xclip, when an image isn't available
-                "There is no owner",  # xclip, when the clipboard isn't initialized
+                # wl-paste, when the clipboard is empty
+                b"Nothing is copied",
+                # wl-paste/debian xclip, when an image isn't available
+                b"not available",
+                # xclip, when an image isn't available
+                b"cannot convert",
+                # xclip, when the clipboard isn't initialized
+                b"There is no owner",
             ]
+            err = p.stderr
             if any(e in err for e in allowed_errors):
                 return None
-            msg = f"{args[0]} error: {err.strip() if err else 'Unknown error'}"
+            msg = f"{args[0]} error: {err.strip().decode() if err else 'Unknown error'}"
             raise ChildProcessError(msg)
 
         data = io.BytesIO(p.stdout)
