Merged revisions 62792,62799-62800 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62792 | brett.cannon | 2008-05-07 01:22:02 +0200 (Wed, 07 May 2008) | 2 lines

  When testing a module's __all__, we really don't care if it is deprecated.
........
  r62799 | christian.heimes | 2008-05-07 01:42:58 +0200 (Wed, 07 May 2008) | 1 line

  Disabled some unit tests for the upcoming release. See #2777
........
  r62800 | brett.cannon | 2008-05-07 01:44:04 +0200 (Wed, 07 May 2008) | 2 lines

  Create a TextMate directory in Misc to house a Python-Dev bundle.
........

1 files changed, 10 insertions, 7 deletions

diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index a2a251909a..d88c400bf8 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -1,18 +1,21 @@
 import unittest
-from test.test_support import run_unittest
+from test.test_support import run_unittest, catch_warning
 import sys
+import warnings
 
 
 class AllTest(unittest.TestCase):
 
     def check_all(self, modname):
         names = {}
-        try:
-            exec("import %s" % modname, names)
-        except ImportError:
-            # Silent fail here seems the best route since some modules
-            # may not be available in all environments.
-            return
+        with catch_warning():
+            warnings.filterwarnings("ignore", ".* module", DeprecationWarning)
+            try:
+                exec("import %s" % modname, names)
+            except ImportError:
+                # Silent fail here seems the best route since some modules
+                # may not be available in all environments.
+                return
         self.failUnless(hasattr(sys.modules[modname], "__all__"),
                         "%s has no __all__ attribute" % modname)
         names = {}