summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-03-26 15:06:15 (GMT)
committerFred Drake <fdrake@acm.org>2001-03-26 15:06:15 (GMT)
commitfc31f2692f3cf022606b48534801f4371bf11001 (patch)
tree939bdd2420cc9aba7d1414a83a88d871adaf022b /Lib
parent4240bc50f635a91be49ad86fb7f8e4408fd2df25 (diff)
downloadcpython-fc31f2692f3cf022606b48534801f4371bf11001.zip
cpython-fc31f2692f3cf022606b48534801f4371bf11001.tar.gz
cpython-fc31f2692f3cf022606b48534801f4371bf11001.tar.bz2
Update auto-detection for Konqueror to include KDE 2 -- the kfm command is
gone; "konqueror" is the new name, and the command-line args are different. kfmclient has not changed, though.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/webbrowser.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
index 77edf0d..ebafd80 100644
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -136,7 +136,7 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
register("mosaic", None, GenericBrowser("mosaic %s >/dev/null &"))
# Konqueror/kfm, the KDE browser.
- if _iscommand("kfm"):
+ if _iscommand("kfm") or _iscommand("konqueror"):
class Konqueror:
"""Controller for the KDE File Manager (kfm, or Konqueror).
@@ -149,7 +149,10 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
rc = os.system(cmd)
if rc:
import time
- os.system("kfm -d &")
+ if _iscommand("konqueror"):
+ os.system("konqueror --silent &")
+ else:
+ os.system("kfm -d &")
time.sleep(PROCESS_CREATION_DELAY)
rc = os.system(cmd)
return not rc