gh-108172: do not override OS preferred browser if it is a super-string of a known browser (GH-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".

https://github.com/python/cpython/issues/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.

---------

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
This commit is contained in:
Oded Arbel 2024-08-31 09:11:57 +03:00 committed by GitHub
parent 74bfb53e3a
commit 10bf615bab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions

View File

@ -31,7 +31,7 @@ def register(name, klass, instance=None, *, preferred=False):
# Preferred browsers go to the front of the list. # Preferred browsers go to the front of the list.
# Need to match to the default browser returned by xdg-settings, which # Need to match to the default browser returned by xdg-settings, which
# may be of the form e.g. "firefox.desktop". # 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) _tryorder.insert(0, name)
else: else:
_tryorder.append(name) _tryorder.append(name)

View File

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