mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

_tryorder should always be a list, then the problem Jack had to fix in

Browse source 
1.24 wouldn't have occurred in the first place.

Remove a debug print command accidentally inserted by Martin in 1.23.
This commit is contained in:
Guido van Rossum 2001-12-03 15:51:31 +00:00
parent cdbbd0a59d
commit cb33165ca2
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/webbrowser.py
View file

@ -116,7 +116,6 @@ class Netscape:
cmd = "%s %s -remote '%s' >/dev/null 2>&1" % (self.name, cmd = "%s %s -remote '%s' >/dev/null 2>&1" % (self.name,
raise_opt, raise_opt,
action) action)
print cmd
rc = os.system(cmd) rc = os.system(cmd)
if rc: if rc:
import time import time
@ -233,7 +232,7 @@ class WindowsDefault:
# the TERM and DISPLAY cases, because we might be running Python from inside # the TERM and DISPLAY cases, because we might be running Python from inside
# an xterm. # an xterm.
if os.environ.get("TERM") or os.environ.get("DISPLAY"): if os.environ.get("TERM") or os.environ.get("DISPLAY"):
_tryorder = ("mozilla","netscape","kfm","grail","links","lynx","w3m") _tryorder = ["mozilla","netscape","kfm","grail","links","lynx","w3m"]
# Easy cases first -- register console browsers if we have them. # Easy cases first -- register console browsers if we have them.
if os.environ.get("TERM"): if os.environ.get("TERM"):
@ -282,7 +281,7 @@ class InternetConfig:
# #
if sys.platform[:3] == "win": if sys.platform[:3] == "win":
_tryorder = ("netscape", "windows-default") _tryorder = ["netscape", "windows-default"]
register("windows-default", WindowsDefault) register("windows-default", WindowsDefault)
# #
@ -296,7 +295,7 @@ except ImportError:
else: else:
# internet-config is the only supported controller on MacOS, # internet-config is the only supported controller on MacOS,
# so don't mess with the default! # so don't mess with the default!
_tryorder = ("internet-config", ) _tryorder = ["internet-config"]
register("internet-config", InternetConfig) register("internet-config", InternetConfig)
# #
@ -304,7 +303,7 @@ else:
# #
if sys.platform[:3] == "os2" and _iscommand("netscape.exe"): if sys.platform[:3] == "os2" and _iscommand("netscape.exe"):
_tryorder = ("os2netscape",) _tryorder = ["os2netscape"]
register("os2netscape", None, register("os2netscape", None,
GenericBrowser("start netscape.exe %s")) GenericBrowser("start netscape.exe %s"))