diff options
| author |   Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-06-03 06:01:23 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-06-03 06:01:23 -0700 |
| commit | 911c35d5d334b8c148202f2a7a32b511958032fc (patch) | |
| tree | 2c092fa2ad166f376464a146ec34d879d24da955 | |
| parent | Ensure correct version of Sphinx is used for Windows builds (GH-20582) (diff) | |
| download | cpython-911c35d5d334b8c148202f2a7a32b511958032fc.tar.gz cpython-911c35d5d334b8c148202f2a7a32b511958032fc.tar.bz2 cpython-911c35d5d334b8c148202f2a7a32b511958032fc.zip | |
bpo-40767: Allow pure Wayland to get default XDG web browser (GH-20382)
Would be nice to backport to python 3.7+. I don't think it's worth the hassle to backport this all the way down to 3.10. But I'll let the maintainers decide.
This is hard to test because the test setup already includes this [environment variable](https://github.com/python/cpython/blob/master/Lib/test/pythoninfo.pyGH-L292)
Let me know if something doesn't match the PR guidelines. This is my first PR in the python source code.
(cherry picked from commit c822efeda9a0afe87cf3429724732fc8e19a01fb)
Co-authored-by: Jeremy Attali <jeremy.attali@gmail.com>
| -rwxr-xr-x | Lib/webbrowser.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-05-27-21-27-01.bpo-40767.L5MnVV.rst | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index 34b86a505c2..b04ec7b65ae 100755 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -540,7 +540,7 @@ def register_standard_browsers(): register(browser, None, BackgroundBrowser(browser)) else: # Prefer X browsers if present - if os.environ.get("DISPLAY"): + if os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY"): try: cmd = "xdg-settings get default-web-browser".split() raw_result = subprocess.check_output(cmd, stderr=subprocess.DEVNULL) diff --git a/Misc/NEWS.d/next/Library/2020-05-27-21-27-01.bpo-40767.L5MnVV.rst b/Misc/NEWS.d/next/Library/2020-05-27-21-27-01.bpo-40767.L5MnVV.rst new file mode 100644 index 00000000000..4bebb311b4d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-05-27-21-27-01.bpo-40767.L5MnVV.rst @@ -0,0 +1,3 @@ +:mod:`webbrowser` now properly finds the default browser in pure Wayland +systems by checking the WAYLAND_DISPLAY environment variable. Patch +contributed by Jérémy Attali. |