diff options
| -rw-r--r-- | Lib/test/test_py3kwarn.py | 8 | ||||
| -rw-r--r-- | Lib/webbrowser.py | 12 |
2 files changed, 7 insertions, 13 deletions
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py index 6d3d962..32c36a9 100644 --- a/Lib/test/test_py3kwarn.py +++ b/Lib/test/test_py3kwarn.py @@ -323,7 +323,13 @@ class TestStdlibRemovals(unittest.TestCase): 'IOCTL', 'jpeg', 'panel', 'panelparser', 'readcd', 'SV', 'torgb', 'WAIT'), 'darwin' : ('autoGIL', 'Carbon', 'OSATerminology', - 'icglue', 'Nav', 'MacOS', 'aepack', + 'icglue', 'Nav', + # MacOS should (and does) give a Py3kWarning, but one of the + # earlier tests already imports the MacOS extension which causes + # this test to fail. Disabling the test for 'MacOS' avoids this + # spurious test failure. + #'MacOS', + 'aepack', 'aetools', 'aetypes', 'applesingle', 'appletrawmain', 'appletrunner', 'argvemulator', 'bgenlocations', diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index ca30c4e..8af14b9 100644 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -539,18 +539,6 @@ if sys.platform[:3] == "win": # Platform support for MacOS # -try: - import ic -except ImportError: - pass -else: - class InternetConfig(BaseBrowser): - def open(self, url, new=0, autoraise=True): - ic.launchurl(url) - return True # Any way to get status? - - register("internet-config", InternetConfig, update_tryorder=-1) - if sys.platform == 'darwin': # Adapted from patch submitted to SourceForge by Steven J. Burr class MacOSX(BaseBrowser): |