summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/webbrowser.py4
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index bfd353a467..74f0270122 100644
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -625,7 +625,9 @@ if "BROWSER" in os.environ:
# and prepend to _tryorder
for cmdline in _userchoices:
if cmdline != '':
- _synthesize(cmdline, -1)
+ cmd = _synthesize(cmdline, -1)
+ if cmd[1] is None:
+ register(cmdline, None, GenericBrowser(cmdline), -1)
cmdline = None # to make del work if _userchoices was empty
del cmdline
del _userchoices
diff --git a/Misc/NEWS b/Misc/NEWS
index f98706c0a7..eea32c1a90 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -364,6 +364,9 @@ Core and Builtins
Library
-------
+- Issue #2666: Handle BROWSER environment variable properly for unknown browser
+ names in the webbrowser module.
+
- Issue #6054: Do not normalize stored pathnames in tarfile.
- Issue #6794: Fix Decimal.compare_total and Decimal.compare_total_mag: NaN