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

Fred L. Drake python-dev@python.org
Sun, 1 Oct 2000 20:40:54 -0700


Update of /cvsroot/python/python/dist/src/Lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv26061/Lib

Modified Files:
	webbrowser.py 
Log Message:

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!


Index: webbrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/webbrowser.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** webbrowser.py	2000/09/22 10:05:52	1.3
--- webbrowser.py	2000/10/02 03:40:51	1.4
***************
*** 197,203 ****
      DEFAULT_BROWSER = "windows-default"
  elif os.environ.get("DISPLAY"):
!     if os.environ.get("KDEDIR"):
!         DEFAULT_BROWSER = "kfm"
!     elif _iscommand("netscape"):
          DEFAULT_BROWSER = "netscape"
  
--- 197,201 ----
      DEFAULT_BROWSER = "windows-default"
  elif os.environ.get("DISPLAY"):
!     if _iscommand("netscape"):
          DEFAULT_BROWSER = "netscape"