[Python-checkins] cpython (merge 3.3 -> default): - Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser,
matthias.klose
python-checkins at python.org
Sun Mar 24 18:50:38 CET 2013
http://hg.python.org/cpython/rev/34648809d777
changeset: 82944:34648809d777
parent: 82942:bedb4cbdd311
parent: 82943:206522d9134e
user: doko at ubuntu.com
date: Sun Mar 24 18:50:23 2013 +0100
summary:
- Issue #17536: Add to webbrowser's browser list: www-browser, x-www-browser,
iceweasel, iceape.
files:
Lib/webbrowser.py | 6 ++++++
Misc/NEWS | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -437,9 +437,13 @@
if "KDE_FULL_SESSION" in os.environ and shutil.which("kfmclient"):
register("kfmclient", Konqueror, Konqueror("kfmclient"))
+ 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 shutil.which(browser):
register(browser, None, Mozilla(browser))
@@ -482,6 +486,8 @@
# Also try console browsers
if os.environ.get("TERM"):
+ 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 shutil.which("links"):
register("links", None, GenericBrowser("links"))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -294,6 +294,9 @@
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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list