[3.12] pythongh-108172: do not override OS preferred browser if it is a super-string of a known browser (pythonGH-113011) (pythonGH-123528)

miss-islington · guss77 · AlexWaygood · web-flow · commit bf9981830393 · 2024-08-31T06:33:06.000Z
pythongh-108172: do not override OS preferred browser if it is a super-string of a known browser (pythonGH-113011) When checking if the registering browser is the "OS preferred browser", do not use a substring search - that makes no sense: one can have a preferred browser that looks like a super-string of a known browser, e.g. "firefox-nightly" vs "firefox". python#108172 explains in more detail, and lays out a potential better future enhancement for this case of just using xdg-open. We'll go with this for now. --------- (cherry picked from commit 10bf615) Co-authored-by: Oded Arbel <oded@geek.co.il> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
@@ -30,7 +30,7 @@ def register(name, klass, instance=None, *, preferred=False):
         # Preferred browsers go to the front of the list.
         # Need to match to the default browser returned by xdg-settings, which
         # may be of the form e.g. "firefox.desktop".
-        if preferred or (_os_preferred_browser and name in _os_preferred_browser):
+        if preferred or (_os_preferred_browser and f'{name}.desktop' == _os_preferred_browser):
             _tryorder.insert(0, name)
         else:
             _tryorder.append(name)
diff --git a/Misc/NEWS.d/next/Library/2023-12-12-15-19-58.gh-issue-108172.KyDPuG.rst b/Misc/NEWS.d/next/Library/2023-12-12-15-19-58.gh-issue-108172.KyDPuG.rst
@@ -0,0 +1 @@
+``webbrowser`` honors OS preferred browser on Linux when its desktop entry name contains the text of a known browser name.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+``webbrowser`` honors OS preferred browser on Linux when its desktop entry name contains the text of a known browser name.