Changeset 391 for python/trunk/Lib/test/test_sundry.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_sundry.py (modified) (4 diffs)

python/trunk/Lib/test/test_sundry.py

@@ -4 +4 @@
 import sys
 import unittest
-import warnings
 
 
 class TestUntestedModules(unittest.TestCase):
     def test_at_least_import_untested_modules(self):
-        with warnings.catch_warnings():
+        with test_support.check_warnings(quiet=True):
             import CGIHTTPServer
             import audiodev
@@ -24 +23 @@
             if sys.platform.startswith('win'):
                 import distutils.msvccompiler
-            import distutils.mwerkscompiler
             import distutils.text_file
             import distutils.unixccompiler
@@ -56 +54 @@
             import keyword
             import linecache
-            import macurl2path
             import mailcap
             import mimify
@@ -68 +65 @@
             import py_compile
             import rexec
-            import rlcompleter
             import sched
             import sndhdr