[Python-checkins] CVS: python/dist/src/Lib webbrowser.py,1.15,1.16

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv3001

Modified Files:
	webbrowser.py 
Log Message:

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.


Index: webbrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/webbrowser.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** webbrowser.py	2001/03/02 02:01:40	1.15
--- webbrowser.py	2001/03/26 15:06:15	1.16
***************
*** 137,141 ****
  
          # Konqueror/kfm, the KDE browser.
!         if _iscommand("kfm"):
              class Konqueror:
                  """Controller for the KDE File Manager (kfm, or Konqueror).
--- 137,141 ----
  
          # Konqueror/kfm, the KDE browser.
!         if _iscommand("kfm") or _iscommand("konqueror"):
              class Konqueror:
                  """Controller for the KDE File Manager (kfm, or Konqueror).
***************
*** 150,154 ****
                      if rc:
                          import time
!                         os.system("kfm -d &")
                          time.sleep(PROCESS_CREATION_DELAY)
                          rc = os.system(cmd)
--- 150,157 ----
                      if rc:
                          import time
!                         if _iscommand("konqueror"):
!                             os.system("konqueror --silent &")
!                         else:
!                             os.system("kfm -d &")
                          time.sleep(PROCESS_CREATION_DELAY)
                          rc = os.system(cmd)