From: doko@ubuntu.com <doko@ubuntu.com>
Date: Sun, 24 Mar 2013 17:50:23 +0000 (+0100)
Subject: - Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser,
X-Git-Tag: v3.4.0a1~1096
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f85aca8d1eb7bf15540be3515ab249a0ab335a4c;p=python

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

f85aca8d1eb7bf15540be3515ab249a0ab335a4c
diff --cc Lib/webbrowser.py
index 11ecce013c,945eda4a95..2714bd144e
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@@ -434,14 -465,18 +434,18 @@@ def register_X_browsers()
          register("gnome-open", None, BackgroundBrowser("gnome-open"))
  
      # The default KDE browser
 -    if "KDE_FULL_SESSION" in os.environ and _iscommand("kfmclient"):
 +    if "KDE_FULL_SESSION" in os.environ and shutil.which("kfmclient"):
          register("kfmclient", Konqueror, Konqueror("kfmclient"))
  
 -    if _iscommand("x-www-browser"):
++    if shutil.which("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):
 +        if shutil.which(browser):
              register(browser, None, Mozilla(browser))
  
      # Konqueror/kfm, the KDE browser.
@@@ -482,16 -517,18 +486,18 @@@ if os.environ.get("DISPLAY")
  
  # Also try console browsers
  if os.environ.get("TERM"):
 -    if _iscommand("www-browser"):
++    if shutil.which("www-browser"):
+         register("www-browser", None, GenericBrowser("www-browser"))
      # The Links/elinks browsers <http://artax.karlin.mff.cuni.cz/~mikulas/links/>
 -    if _iscommand("links"):
 +    if shutil.which("links"):
          register("links", None, GenericBrowser("links"))
 -    if _iscommand("elinks"):
 +    if shutil.which("elinks"):
          register("elinks", None, Elinks("elinks"))
      # The Lynx browser <http://lynx.isc.org/>, <http://lynx.browser.org/>
 -    if _iscommand("lynx"):
 +    if shutil.which("lynx"):
          register("lynx", None, GenericBrowser("lynx"))
      # The w3m browser <http://w3m.sourceforge.net/>
 -    if _iscommand("w3m"):
 +    if shutil.which("w3m"):
          register("w3m", None, GenericBrowser("w3m"))
  
  #
diff --cc Misc/NEWS
index 27dc328284,00faf34766..bfbe5665c4
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -294,9 -196,9 +294,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser,
+   iceweasel, iceape.
+ 
 +- Issue #17150: pprint now uses line continuations to wrap long string
 +  literals.
 +
  - 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