Skip to content

gh-113539: Enable using $BROWSER to reorder default seach order in webbrowser.py #113561

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.

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

Merged
merged 9 commits into from
Apr 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Doc/library/webbrowser.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,17 @@ If the environment variable :envvar:`BROWSER` exists, it is interpreted as the
:data:`os.pathsep`-separated list of browsers to try ahead of the platform
defaults. When the value of a list part contains the string ``%s``, then it is
interpreted as a literal browser command line to be used with the argument URL
substituted for ``%s``; if the part does not contain ``%s``, it is simply
interpreted as the name of the browser to launch. [1]_
substituted for ``%s``; if the value is a single word that refers to one of the
already registered browsers this browser is added to the front of the search list;
if the part does not contain ``%s``, it is simply interpreted as the name of the
browser to launch. [1]_

.. versionchanged:: next

The :envvar:`BROWSER` variable can now also be used to reorder the list of
platform defaults. This is particularly useful on macOS where the platform
defaults do not refer to command-line tools on :envvar:`PATH`.


For non-Unix platforms, or when a remote browser is available on Unix, the
controlling process will not wait for the user to finish with the browser, but
Expand Down
11 changes: 11 additions & 0 deletions Doc/whatsnew/3.14.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1378,6 +1378,17 @@ uuid
(Contributed by Simon Legner in :gh:`131236`.)


webbrowser
----------

* Names in the :envvar:`BROWSER` environment variable can now refer to already
registered browsers for the :mod:`webbrowser` module, instead of always
generating a new browser command.

This makes it possible to set :envvar:`BROWSER` to the value of one of the
supported browsers on macOS.


zipinfo
-------

Expand Down
17 changes: 15 additions & 2 deletions Lib/webbrowser.py
Original file line number Diff line number Diff line change
Expand Up @@ -482,10 +482,10 @@ def register_standard_browsers():

if sys.platform == 'darwin':
register("MacOSX", None, MacOSXOSAScript('default'))
register("chrome", None, MacOSXOSAScript('chrome'))
register("chrome", None, MacOSXOSAScript('google chrome'))
register("firefox", None, MacOSXOSAScript('firefox'))
register("safari", None, MacOSXOSAScript('safari'))
# OS X can use below Unix support (but we prefer using the OS X
# macOS can use below Unix support (but we prefer using the macOS
# specific stuff)

if sys.platform == "ios":
Expand Down Expand Up @@ -559,6 +559,19 @@ def register_standard_browsers():
# Treat choices in same way as if passed into get() but do register
# and prepend to _tryorder
for cmdline in userchoices:
if all(x not in cmdline for x in " \t"):
# Assume this is the name of a registered command, use
# that unless it is a GenericBrowser.
try:
command = _browsers[cmdline.lower()]
except KeyError:
pass

else:
if not isinstance(command[1], GenericBrowser):
_tryorder.insert(0, cmdline.lower())
continue

if cmdline != '':
cmd = _synthesize(cmdline, preferred=True)
if cmd[1] is None:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
:mod:`webbrowser`: Names in the :envvar:`BROWSER` environment variable can now
refer to already registered web browsers, instead of always generating a new
browser command.

This makes it possible to set :envvar:`BROWSER` to the value of one of the
supported browsers on macOS.
Loading