Skip to content

gh-85644: webbrowser: Use $XDG_CURRENT_DESKTOP to check desktop #21731

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
Merged
merged 3 commits into from
Mar 2, 2024
Merged

gh-85644: webbrowser: Use $XDG_CURRENT_DESKTOP to check desktop #21731

merged 3 commits into from
Mar 2, 2024
+11 −3

Conversation

3v1n0
Copy link
Contributor

@3v1n0 3v1n0 commented Aug 4, 2020 •
edited by bedevere-app bot
Loading

Usage of $GNOME_DESKTOP_SESSION_ID env variable is deprecated since
GNOME 3.30.0 [1], so should not be used, while the standard
XDG_CURRENT_DESKTOP should be instead preferred.

[1] https://gitlab.gnome.org/GNOME/gnome-session/-/commit/00e0e6226371d53f65

https://bugs.python.org/issue41472

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

CLA Missing

Our records indicate the following people have not signed the CLA:

@3v1n0

For legal reasons we need all the people listed to sign the CLA before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

@serhiy-storchaka serhiy-storchaka changed the title bpo-41472: webbrowser: Use $XDG_CURRENT_DESKTOP to check desktop gh-85644: webbrowser: Use $XDG_CURRENT_DESKTOP to check desktop Feb 27, 2024
serhiy-storchaka
serhiy-storchaka requested changes Feb 27, 2024
View reviewed changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but please resolve conflict and add a NEWS entry.

@bedevere-app
Copy link

bedevere-app bot commented Feb 27, 2024

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@3v1n0
webbrowser: Use $XDG_CURRENT_DESKTOP to check desktop
b0e545e 
Usage of $GNOME_DESKTOP_SESSION_ID env variable is deprecated since
GNOME 3.30.0 [1], so should not be used, while the standard
XDG_CURRENT_DESKTOP should be instead preferred.

[1] https://gitlab.gnome.org/GNOME/gnome-session/-/commit/00e0e6226371d53f65
@3v1n0 3v1n0 force-pushed the desktop-envs-fixes branch from d13cfdf to b0e545e Compare February 27, 2024 20:04
@bedevere-app
Copy link

bedevere-app bot commented Feb 27, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@3v1n0 3v1n0 force-pushed the desktop-envs-fixes branch 2 times, most recently from c66f0dc to 11e74f1 Compare February 27, 2024 20:15
@3v1n0
Copy link
Contributor Author

3v1n0 commented Feb 27, 2024

I have made the requested changes; please review again

@blurb-it @3v1n0
News: Add NEWS for the change
407a580 
📜🤖 Added by blurb_it.
@3v1n0 3v1n0 force-pushed the desktop-envs-fixes branch from 11e74f1 to 407a580 Compare February 27, 2024 20:17
serhiy-storchaka
serhiy-storchaka approved these changes Mar 2, 2024
View reviewed changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@serhiy-storchaka serhiy-storchaka enabled auto-merge (squash) March 2, 2024 12:25
@3v1n0 3v1n0 mannequin mentioned this pull request Mar 2, 2024
Closed
@serhiy-storchaka serhiy-storchaka linked an issue Mar 2, 2024 that may be closed by this pull request
webbrowser uses deprecated env variables to detect desktop type #85644
Closed
@serhiy-storchaka serhiy-storchaka merged commit 140d9ec into python:main Mar 2, 2024
@bedevere-bot
Copy link

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 Windows11 Bigmem 3.x has failed when building commit 140d9ec.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/1079/builds/3538) and take a look at the build logs.
  4. Check if the failure is related to this commit (140d9ec) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/1079/builds/3538

Failed tests:

  • test_bigmem

Summary of the results of the build (if available):

==

Click to see traceback logs 
remote: Enumerating objects: 9, done.        
remote: Counting objects:  11% (1/9)        
remote: Counting objects:  22% (2/9)        
remote: Counting objects:  33% (3/9)        
remote: Counting objects:  44% (4/9)        
remote: Counting objects:  55% (5/9)        
remote: Counting objects:  66% (6/9)        
remote: Counting objects:  77% (7/9)        
remote: Counting objects:  88% (8/9)        
remote: Counting objects: 100% (9/9)        
remote: Counting objects: 100% (9/9), done.        
remote: Compressing objects:  12% (1/8)        
remote: Compressing objects:  25% (2/8)        
remote: Compressing objects:  37% (3/8)        
remote: Compressing objects:  50% (4/8)        
remote: Compressing objects:  62% (5/8)        
remote: Compressing objects:  75% (6/8)        
remote: Compressing objects:  87% (7/8)        
remote: Compressing objects: 100% (8/8)        
remote: Compressing objects: 100% (8/8), done.        
remote: Total 9 (delta 1), reused 2 (delta 1), pack-reused 0        
From https://github.com/python/cpython
 * branch                  main       -> FETCH_HEAD
Note: switching to '140d9ec4bcf969b62a742f81e2892fe04a44b6ac'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 140d9ec4bc gh-85644: webbrowser: Use $XDG_CURRENT_DESKTOP to check desktop (GH-21731)
Switched to and reset branch 'main'

Could Not Find R:\buildarea\3.x.ambv-bb-win11.bigmem\build\Lib\*.pyc
The system cannot find the file specified.
Could Not Find R:\buildarea\3.x.ambv-bb-win11.bigmem\build\PCbuild\python*.zip

Could Not Find R:\buildarea\3.x.ambv-bb-win11.bigmem\build\PCbuild\python*.zip

woodruffw pushed a commit to woodruffw-forks/cpython that referenced this pull request Mar 4, 2024
@3v1n0 @woodruffw
pythongh-85644: webbrowser: Use $XDG_CURRENT_DESKTOP to check desktop (…
f304e03 
…pythonGH-21731)

Usage of $GNOME_DESKTOP_SESSION_ID env variable is deprecated since
GNOME 3.30.0 [1], so should not be used, while the standard
XDG_CURRENT_DESKTOP should be instead preferred.

[1] https://gitlab.gnome.org/GNOME/gnome-session/-/commit/00e0e6226371d53f65
adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 25, 2024
@3v1n0 @adorilson
pythongh-85644: webbrowser: Use $XDG_CURRENT_DESKTOP to check desktop (…
6963650 
…pythonGH-21731)

Usage of $GNOME_DESKTOP_SESSION_ID env variable is deprecated since
GNOME 3.30.0 [1], so should not be used, while the standard
XDG_CURRENT_DESKTOP should be instead preferred.

[1] https://gitlab.gnome.org/GNOME/gnome-session/-/commit/00e0e6226371d53f65
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
@3v1n0 @diegorusso
pythongh-85644: webbrowser: Use $XDG_CURRENT_DESKTOP to check desktop (…
1f37f8f 
…pythonGH-21731)

Usage of $GNOME_DESKTOP_SESSION_ID env variable is deprecated since
GNOME 3.30.0 [1], so should not be used, while the standard
XDG_CURRENT_DESKTOP should be instead preferred.

[1] https://gitlab.gnome.org/GNOME/gnome-session/-/commit/00e0e6226371d53f65
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

webbrowser uses deprecated env variables to detect desktop type
6 participants
@3v1n0 @the-knights-who-say-ni @bedevere-bot @serhiy-storchaka @csabella @ezio-melotti