diff options
Diffstat (limited to 'Lib/webbrowser.py')
| -rw-r--r-- | Lib/webbrowser.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index 94d4ad4..f1a071b 100644 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -418,7 +418,7 @@ class Grail(BaseBrowser): # need to PING each one until we find one that's live try: s.connect(fn) - except socket.error: + except OSError: # no good; attempt to clean it out, but don't fail: try: os.unlink(fn) @@ -534,7 +534,7 @@ if sys.platform[:3] == "win": def open(self, url, new=0, autoraise=True): try: os.startfile(url) - except WindowsError: + except OSError: # [Error 22] No application is associated with the specified # file for this operation: '<URL>' return False @@ -638,17 +638,6 @@ if sys.platform == 'darwin': register("MacOSX", None, MacOSXOSAScript('default'), -1) -# -# Platform support for OS/2 -# - -if sys.platform[:3] == "os2" and _iscommand("netscape"): - _tryorder = [] - _browsers = {} - register("os2netscape", None, - GenericBrowser(["start", "netscape", "%s"]), -1) - - # OK, now that we know what the default preference orders for each # platform are, allow user to override them with the BROWSER variable. if "BROWSER" in os.environ: |