python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-11 04:07:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Call init() if mimetype is not found with preinit()

Browse Source
This commit is contained in:
Andrew Murray 2023-04-18 10:33:31 +10:00
parent b7585b0597
commit f15d7265f7
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tests/test_imagegrab.py
View File

@ -106,11 +106,10 @@ $ms = new-object System.IO.MemoryStream(, $bytes)
), ),
reason="Linux with wl-clipboard only", reason="Linux with wl-clipboard only",
) )
@pytest.mark.parametrize( @pytest.mark.parametrize("ext", ("gif", "png", "ico"))
"image_path", ["Tests/images/hopper.gif", "Tests/images/hopper.png"] def test_grabclipboard_wl_clipboard(self, ext):
) image_path = "Tests/images/hopper." + ext
def test_grabclipboard_wl_clipboard(self, image_path): with open(image_path, "rb") as fp:
with open(image_path, mode="rb") as raw_image: subprocess.call(["wl-copy"], stdin=fp)
subprocess.call(["wl-copy"], stdin=raw_image)
im = ImageGrab.grabclipboard() im = ImageGrab.grabclipboard()
assert_image_equal_tofile(im, image_path) assert_image_equal_tofile(im, image_path)

16
src/PIL/ImageGrab.py
View File

@ -137,11 +137,19 @@ def grabclipboard():
args = ["wl-paste"] args = ["wl-paste"]
output = subprocess.check_output(["wl-paste", "-l"]).decode() output = subprocess.check_output(["wl-paste", "-l"]).decode()
clipboard_mimetypes = output.splitlines() clipboard_mimetypes = output.splitlines()
def find_mimetype():
for mime in Image.MIME.values():
if mime in clipboard_mimetypes:
return mime
Image.preinit() Image.preinit()
for mimetype in Image.MIME.values(): mimetype = find_mimetype()
if mimetype in clipboard_mimetypes: if not mimetype:
args.extend(["-t", mimetype]) Image.init()
break mimetype = find_mimetype()
if mimetype:
args.extend(["-t", mimetype])
elif shutil.which("xclip"): elif shutil.which("xclip"):
args = ["xclip", "-selection", "clipboard", "-t", "image/png", "-o"] args = ["xclip", "-selection", "clipboard", "-t", "image/png", "-o"]
else: else: