diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-06-22 09:18:28 (GMT) |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-06-22 09:18:28 (GMT) |
commit | 934f4e1f398bb0dd712f40ecf7957327bdae33f8 (patch) | |
tree | aef7a3a91634068202c09e0fda5d257c9e9b9cbe /Lib/webbrowser.py | |
parent | 4f6125996d1d8b164f9b59f90b5215462ca5a0e9 (diff) | |
download | cpython-934f4e1f398bb0dd712f40ecf7957327bdae33f8.zip cpython-934f4e1f398bb0dd712f40ecf7957327bdae33f8.tar.gz cpython-934f4e1f398bb0dd712f40ecf7957327bdae33f8.tar.bz2 |
Fix for issue8446:
* Don't import 'ic' in webbrowser, that module is no longer used
* Remove 'MacOS' from the list of modules that should emit a Py3kWarning on import.
This is needed because one of the earlier tests triggers and import of this
extension, and that causes a failure in test_py3kwarn (running test_py3kwarn
separately worked fine)
With these changes 'make tests' no longer says that test_py3kwarn fails.
Diffstat (limited to 'Lib/webbrowser.py')
-rw-r--r-- | Lib/webbrowser.py | 12 |
1 files changed, 0 insertions, 12 deletions
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): |