diff options
| author | Guido van Rossum <guido@python.org> | 2001-12-03 15:51:31 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2001-12-03 15:51:31 (GMT) |
| commit | cb33165ca2f8c1493b511bb7b38b44ede4211280 (patch) | |
| tree | f85d7908b5f857639d8246ba0abab0e8374b096c | |
| parent | cdbbd0a59dd9fa3db55c4d21defc495dfbdea0e4 (diff) | |
| download | cpython-cb33165ca2f8c1493b511bb7b38b44ede4211280.zip cpython-cb33165ca2f8c1493b511bb7b38b44ede4211280.tar.gz cpython-cb33165ca2f8c1493b511bb7b38b44ede4211280.tar.bz2 | |
_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.
| -rw-r--r-- | Lib/webbrowser.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index 93d2a8b..11c8301 100644 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -116,7 +116,6 @@ class Netscape: cmd = "%s %s -remote '%s' >/dev/null 2>&1" % (self.name, raise_opt, action) - print cmd rc = os.system(cmd) if rc: import time @@ -233,7 +232,7 @@ class WindowsDefault: # the TERM and DISPLAY cases, because we might be running Python from inside # an xterm. 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. if os.environ.get("TERM"): @@ -282,7 +281,7 @@ class InternetConfig: # if sys.platform[:3] == "win": - _tryorder = ("netscape", "windows-default") + _tryorder = ["netscape", "windows-default"] register("windows-default", WindowsDefault) # @@ -296,7 +295,7 @@ except ImportError: else: # internet-config is the only supported controller on MacOS, # so don't mess with the default! - _tryorder = ("internet-config", ) + _tryorder = ["internet-config"] register("internet-config", InternetConfig) # @@ -304,7 +303,7 @@ else: # if sys.platform[:3] == "os2" and _iscommand("netscape.exe"): - _tryorder = ("os2netscape",) + _tryorder = ["os2netscape"] register("os2netscape", None, GenericBrowser("start netscape.exe %s")) |