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

[Guido van Rossum]

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

Modified Files:
	webbrowser.py 
Log Message:
_tryorder should always be a list, then the problem Jack had to fix in
1.24 wouldn't have occurred in the first place.

Remove a debug print command accidentally inserted by Martin in 1.23.


Index: webbrowser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/webbrowser.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** webbrowser.py	2001/12/03 15:44:17	1.24
--- webbrowser.py	2001/12/03 15:51:31	1.25
***************
*** 117,121 ****
                                                        raise_opt,
                                                        action)
-         print cmd
          rc = os.system(cmd)
          if rc:
--- 117,120 ----
***************
*** 234,238 ****
  # an xterm.
  if os.environ.get("TERM") or os.environ.get("DISPLAY"):
!     _tryorder = ("mozilla","netscape","kfm","grail","links","lynx","w3m")
  
      # Easy cases first -- register console browsers if we have them.
--- 233,237 ----
  # an xterm.
  if os.environ.get("TERM") or os.environ.get("DISPLAY"):
!     _tryorder = ["mozilla","netscape","kfm","grail","links","lynx","w3m"]
  
      # Easy cases first -- register console browsers if we have them.
***************
*** 283,287 ****
  
  if sys.platform[:3] == "win":
!     _tryorder = ("netscape", "windows-default")
      register("windows-default", WindowsDefault)
  
--- 282,286 ----
  
  if sys.platform[:3] == "win":
!     _tryorder = ["netscape", "windows-default"]
      register("windows-default", WindowsDefault)
  
***************
*** 297,301 ****
      # internet-config is the only supported controller on MacOS,
      # so don't mess with the default!
!     _tryorder = ("internet-config", )
      register("internet-config", InternetConfig)
  
--- 296,300 ----
      # internet-config is the only supported controller on MacOS,
      # so don't mess with the default!
!     _tryorder = ["internet-config"]
      register("internet-config", InternetConfig)
  
***************
*** 305,309 ****
  
  if sys.platform[:3] == "os2" and _iscommand("netscape.exe"):
!     _tryorder = ("os2netscape",)
      register("os2netscape", None,
               GenericBrowser("start netscape.exe %s"))
--- 304,308 ----
  
  if sys.platform[:3] == "os2" and _iscommand("netscape.exe"):
!     _tryorder = ["os2netscape"]
      register("os2netscape", None,
               GenericBrowser("start netscape.exe %s"))