diff options
| -rw-r--r-- | Lib/webbrowser.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index efdebdc8b1..cb9dbb36bd 100644 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -261,8 +261,7 @@ class WindowsDefault: # the TERM and DISPLAY cases, because we might be running Python from inside # an xterm. if os.environ.get("TERM") or os.environ.get("DISPLAY"): - _tryorder = ["galeon", "mozilla", "netscape", "kfm", - "grail", "links", "lynx", "w3m",] + _tryorder = ["links", "lynx", "w3m"] # Easy cases first -- register console browsers if we have them. if os.environ.get("TERM"): @@ -278,6 +277,9 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"): # X browsers have more in the way of options if os.environ.get("DISPLAY"): + _tryorder = ["galeon", "skipstone", "mozilla", "netscape", + "kfm", "grail"] + _tryorder + # First, the Netscape series if _iscommand("mozilla"): register("mozilla", None, Netscape("mozilla")) @@ -293,6 +295,11 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"): if _iscommand("galeon"): register("galeon", None, Galeon("galeon")) + # Skipstone, another Gtk/Mozilla based browser + if _iscommand("skipstone"): + register("skipstone", None, GenericBrowser( + "skipstone '%s' >/dev/null &")) + # Konqueror/kfm, the KDE browser. if _iscommand("kfm") or _iscommand("konqueror"): register("kfm", Konqueror, Konqueror()) @@ -628,6 +628,10 @@ Library the config file, including the contents of the referred filename in the "%verifyscript" section of the rpm spec file. +- Fixed bug #495695: webbrowser module would run graphic browsers in a + unix environment even if DISPLAY was not set. Also, support for + skipstone browser was included. + Tools/Demos ----------- |