From: Simon McVittie <smcv@debian.org>
Date: Wed, 5 Jan 2022 11:53:23 +0000 (+0000)
Subject: bpo-43137: Revert "webbrowser: Don't run gvfs-open on GNOME" (GH-30417)
X-Git-Tag: v3.11.0a4~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd50316e458d7c3284f8948b0606d8aa91ab855d;p=thirdparty%2FPython%2Fcpython.git

bpo-43137: Revert "webbrowser: Don't run gvfs-open on GNOME" (GH-30417)

gvfs-open was deprecated in 2015 and removed in 2018, but its replacement,
gio(1), is not available in Ubuntu 16.04, which is apparently still
supported by CPython upstream even though it is considered to be EOL by
Ubuntu developers.

Signed-off-by: Simon McVittie <smcv@debian.org>
---

diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index 02d203690617..44974d433b46 100755
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -467,6 +467,10 @@ def register_X_browsers():
     if shutil.which("gio"):
         register("gio", None, BackgroundBrowser(["gio", "open", "--", "%s"]))
 
+    # Equivalent of gio open before 2015
+    if "GNOME_DESKTOP_SESSION_ID" in os.environ and shutil.which("gvfs-open"):
+        register("gvfs-open", None, BackgroundBrowser("gvfs-open"))
+
     # The default KDE browser
     if "KDE_FULL_SESSION" in os.environ and shutil.which("kfmclient"):
         register("kfmclient", Konqueror, Konqueror("kfmclient"))