Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved wl-paste mimetype handling in ImageGrab #7094

Merged
merged 13 commits into from
May 24, 2023
Merged

Improved wl-paste mimetype handling in ImageGrab #7094

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
099d696
Fix ImageGrab with wl-paste
rrcgat Apr 15, 2023
6d12581
Update src/PIL/ImageGrab.py
rrcgat Apr 16, 2023
3d54b8e
Remove useless try catch block
rrcgat Apr 16, 2023
8871b95
Merge branch 'main' into fix-imagegrab-with-wl-paste
radarhere Apr 17, 2023
aa2e662
Add sway and wl-clipboard dependencies to GitHub CI workflow
rrcgat Apr 17, 2023
b7585b0
Removed unnecessary settings
radarhere Apr 18, 2023
f15d726
Call init() if mimetype is not found with preinit()
radarhere Apr 18, 2023
5a0c431
Merge pull request #1 from radarhere/init
rrcgat Apr 21, 2023
c656583
Merge branch 'main' into fix-imagegrab-with-wl-paste
radarhere May 22, 2023
fffcb55
Use image/png mime type for ImageGrab (wl-paste) if possible, otherwi…
rrcgat May 23, 2023
bce0f0d
Moved function code inline
radarhere May 23, 2023
26d5f4f
Use tuple instead of list
radarhere May 23, 2023
1dffa86
Merge pull request #3 from radarhere/fix-imagegrab-with-wl-paste
rrcgat May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use tuple instead of list
  • Loading branch information
@radarhere
radarhere committed May 23, 2023
commit 26d5f4fcb1fa23c920f42c56e187de092da544a7
6 changes: 3 additions & 3 deletions Tests/test_imagegrab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def test_grabclipboard_png(self):
@pytest.mark.skipif(
(
sys.platform != "linux"
or not all(shutil.which(cmd) for cmd in ["wl-paste", "wl-copy"])
or not all(shutil.which(cmd) for cmd in ("wl-paste", "wl-copy"))
),
reason="Linux with wl-clipboard only",
)
Expand All @@ -111,5 +111,5 @@ 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)
im = ImageGrab.grabclipboard()
assert_image_equal_tofile(im, image_path)