[Python-checkins] r82149 - in python/trunk/Lib: test/test_py3kwarn.py webbrowser.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Jun 22 11:18:28 2010
New Revision: 82149

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



Modified:
   python/trunk/Lib/test/test_py3kwarn.py
   python/trunk/Lib/webbrowser.py

Modified: python/trunk/Lib/test/test_py3kwarn.py
==============================================================================
--- python/trunk/Lib/test/test_py3kwarn.py	(original)
+++ python/trunk/Lib/test/test_py3kwarn.py	Tue Jun 22 11:18:28 2010
@@ -323,7 +323,13 @@
                                      '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',

Modified: python/trunk/Lib/webbrowser.py
==============================================================================
--- python/trunk/Lib/webbrowser.py	(original)
+++ python/trunk/Lib/webbrowser.py	Tue Jun 22 11:18:28 2010
@@ -539,18 +539,6 @@
 # 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):