From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 22 Jun 2010 09:18:28 +0000 (+0000)
Subject: Fix for issue8446:
X-Git-Tag: v2.7~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=934f4e1f398bb0dd712f40ecf7957327bdae33f8;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 6d3d9625b13f..32c36a9f09b6 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 ca30c4ec6895..8af14b9f7455 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):