- Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser,

  iceweasel, iceape.

diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index 94d4ad42e6ab25d568ccf46e6d472853e3afabb7..945eda4a951151b0af189d64283c9e4205dfb23f 100644 (file)
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -468,9 +468,13 @@ def register_X_browsers():
     if "KDE_FULL_SESSION" in os.environ and _iscommand("kfmclient"):
         register("kfmclient", Konqueror, Konqueror("kfmclient"))
 
+    if _iscommand("x-www-browser"):
+        register("x-www-browser", None, BackgroundBrowser("x-www-browser"))
+
     # The Mozilla/Netscape browsers
     for browser in ("mozilla-firefox", "firefox",
                     "mozilla-firebird", "firebird",
+                    "iceweasel", "iceape",
                     "seamonkey", "mozilla", "netscape"):
         if _iscommand(browser):
             register(browser, None, Mozilla(browser))
@@ -513,6 +517,8 @@ if os.environ.get("DISPLAY"):
 
 # Also try console browsers
 if os.environ.get("TERM"):
+    if _iscommand("www-browser"):
+        register("www-browser", None, GenericBrowser("www-browser"))
     # The Links/elinks browsers <http://artax.karlin.mff.cuni.cz/~mikulas/links/>
     if _iscommand("links"):
         register("links", None, GenericBrowser("links"))

diff --git a/Misc/NEWS b/Misc/NEWS
index 2d464a5fff636639a48d1859add971c1b827d6a4..00faf3476616cae3c186dc65aebb61e0abf6190f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -196,6 +196,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser,
+  iceweasel, iceape.
+
 - Issue #17488: Change the subprocess.Popen bufsize parameter default value
   from unbuffered (0) to buffering (-1) to match the behavior existing code
   expects and match the behavior of the subprocess module in Python 2 to avoid