python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-12 09:12:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from radarhere/grabclipboard

Browse Source 
Simplified code
This commit is contained in:
Nicola Guerrera 2024-01-27 13:00:56 +01:00 committed by GitHub
commit 9392f24655
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PIL/ImageGrab.py
View File

@ -158,7 +158,8 @@ def grabclipboard():
p = subprocess.run(args, capture_output=True) p = subprocess.run(args, capture_output=True)
if p.returncode != 0: if p.returncode != 0:
allowed_errors = [ err = p.stderr
for silent_error in [
# wl-paste, when the clipboard is empty # wl-paste, when the clipboard is empty
b"Nothing is copied", b"Nothing is copied",
# wl-paste/debian xclip, when an image isn't available # wl-paste/debian xclip, when an image isn't available
@ -167,9 +168,8 @@ def grabclipboard():
b"cannot convert", b"cannot convert",
# xclip, when the clipboard isn't initialized # xclip, when the clipboard isn't initialized
b"There is no owner", b"There is no owner",
] ]:
err = p.stderr if err in silent_error:
if any(e in err for e in allowed_errors):
return None return None
msg = f"{args[0]} error" msg = f"{args[0]} error"
if err: if err: