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

Added session type check for Linux in ImageGrab.grabclipboard() #7332

Merged

radarhere merged 8 commits into python-pillow:main from TheNooB2706:grabclipboard-linux

Aug 22, 2023

Contributor

TheNooB2706 commented Aug 11, 2023 •

edited by radarhere

Fixes #7331

Changes proposed in this pull request:

Check if current session is X11 or Wayland and decide which command to use. This is done by using loginctl command (based on this). If the session check failed (loginctl not available because eg. not on systemd), fall back to previous routine (assume Wayland first, if wl-paste unavailable then assume X11)
Raise NotImplementedError if xclip unavailable on X11 session or wl-paste unavailable on Wayland session

TheNooB2706 and others added 2 commits

August 11, 2023 17:47


          Add session type check in grabclipboard for Linux

bc658e1


          [pre-commit.ci] auto fixes from pre-commit.com hooks

164ea2d

for more information, see https://pre-commit.ci

radarhere added the Linux label

radarhere reviewed

View reviewed changes

src/PIL/ImageGrab.py Outdated Show resolved Hide resolved

radarhere reviewed

View reviewed changes

src/PIL/ImageGrab.py Outdated Show resolved Hide resolved

radarhere reviewed

View reviewed changes

src/PIL/ImageGrab.py Outdated Show resolved Hide resolved

TheNooB2706 and others added 2 commits

August 11, 2023 21:01


          Apply suggestions from code review

a8b3fea

Simplify conditional expressions

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>


          Use os.getlogin() instead of whoami command for getting username

7b157b0

TheNooB2706 commented

View reviewed changes

src/PIL/ImageGrab.py Outdated Show resolved Hide resolved


          Check session type using environment variable instead of loginctl

0b6ab79

radarhere reviewed

View reviewed changes

src/PIL/ImageGrab.py Outdated Show resolved Hide resolved

radarhere reviewed

View reviewed changes

src/PIL/ImageGrab.py Outdated Show resolved Hide resolved


          Reformat variable name following PEP8

e06edcb

Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>

TheNooB2706 requested a review from radarhere

August 13, 2023 06:12

radarhere approved these changes

View reviewed changes

hugovk approved these changes

View reviewed changes

src/PIL/ImageGrab.py Outdated Show resolved Hide resolved

src/PIL/ImageGrab.py Outdated Show resolved Hide resolved

radarhere changed the title ~~Add session type check in grabclipboard for Linux~~ Added session type check in grabclipboard for Linux

radarhere and others added 2 commits

August 21, 2023 23:58


          Merge branch 'main' into grabclipboard-linux

8b14a67


          Use tuples

9c3bc70

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

radarhere merged commit e021d06 into python-pillow:main

52 of 53 checks passed

radarhere changed the title ~~Added session type check in grabclipboard for Linux~~ Added session type check for Linux in ImageGrab.grabclipboard()

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment