summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-10-02 03:40:51 (GMT)
committerFred Drake <fdrake@acm.org>2000-10-02 03:40:51 (GMT)
commit3944a017130d8ec55493532ae071428768361583 (patch)
treeaf993863174f334c665b8dcdcc5112c9ae869f7c
parent8d3312f4d18e0b620d3ba1780c9ea2fd283a1686 (diff)
downloadcpython-3944a017130d8ec55493532ae071428768361583.zip
cpython-3944a017130d8ec55493532ae071428768361583.tar.gz
cpython-3944a017130d8ec55493532ae071428768361583.tar.bz2
Do not set Konquerer to be the default browser if $KDEDIR is set -- some
Linux distributions which provide both KDE and Gnome set this environment variable even if the user is not using KDE. We do *not* want to start Konquerer if KDE is not running unless the user actually tells us to!
-rw-r--r--Lib/webbrowser.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index a8b0e8b..da70e3b 100644
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -196,9 +196,7 @@ if sys.platform[:3] == "win":
register("windows-default", WindowsDefault)
DEFAULT_BROWSER = "windows-default"
elif os.environ.get("DISPLAY"):
- if os.environ.get("KDEDIR"):
- DEFAULT_BROWSER = "kfm"
- elif _iscommand("netscape"):
+ if _iscommand("netscape"):
DEFAULT_BROWSER = "netscape"
# If the $BROWSER environment variable is set and true, let that be