Skip to content
Closed
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
12 changes: 11 additions & 1 deletion Lib/test/test_webbrowser.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,13 +563,23 @@ def test_get(self):
webbrowser.get('fakebrowser')
self.assertIsNotNone(webbrowser._tryorder)

@unittest.skipIf(" " in sys.executable, "test assumes no space in path (GH-114452)")
def test_synthesize(self):
webbrowser = import_helper.import_fresh_module('webbrowser')
name = os.path.basename(sys.executable).lower()
webbrowser.register(name, None, webbrowser.GenericBrowser(name))
webbrowser.get(sys.executable)

def test_synthesize_space_in_path(self):
webbrowser = import_helper.import_fresh_module('webbrowser')
name = 'testbrowser'
path = os.path.join('path with spaces', name)
webbrowser.register(name, None, webbrowser.GenericBrowser(name))
with mock.patch.object(webbrowser.shutil, 'which', return_value=path) as which:
controller = webbrowser.get(path)
which.assert_called_once_with(path)
self.assertIsInstance(controller, webbrowser.GenericBrowser)
self.assertEqual(controller.name, path)

@unittest.skipIf(
is_apple_mobile,
"Apple mobile doesn't allow modifying browser with environment"
Expand Down
5 changes: 2 additions & 3 deletions Lib/webbrowser.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,9 @@ def _synthesize(browser, *, preferred=False):
executable for the requested browser, return [None, None].

"""
cmd = browser.split()[0]
if not shutil.which(cmd):
if not shutil.which(browser):
return [None, None]
name = os.path.basename(cmd)
name = os.path.basename(browser)
try:
command = _browsers[name.lower()]
except KeyError:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :mod:`webbrowser` failing to find a registered browser when its executable
path contains spaces.
Loading