From bdeacba51bfebf18164fa82cfefd59dcd5ba2498 Mon Sep 17 00:00:00 2001
From: "R. David Murray" <rdmurray@bitdance.com>
Date: Tue, 31 Mar 2009 19:33:15 +0000
Subject: [PATCH] Improve test_support.import_module docstring, remove
 deprecated flag from get_attribute since it isn't likely to do anything
 useful.

---
 Lib/test/test_support.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
index 3df1b27975d..0693850519d 100644
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -43,8 +43,11 @@ class ResourceDenied(unittest.SkipTest):
     """
 
 def import_module(name, deprecated=False):
-    """Import the module to be tested, raising SkipTest if it is not
-    available."""
+    """Import and return the module to be tested, raising SkipTest if
+    it is not available.
+
+    If deprecated is True, any module or package deprecation messages
+    will be suppressed."""
     with warnings.catch_warnings():
         if deprecated:
             warnings.filterwarnings("ignore", ".+ (module|package)",
@@ -56,20 +59,15 @@ def import_module(name, deprecated=False):
         else:
             return module
 
-def get_attribute(module, name, deprecated=False):
-    """Get an attribute from the module, raising SkipTest if it is
-    not available."""
-    with warnings.catch_warnings():
-        if deprecated:
-            warnings.filterwarnings("ignore", ".+ (module|package)",
-                                    DeprecationWarning)
-        try:
-            attribute = getattr(module, name)
-        except AttributeError:
-            raise unittest.SkipTest("module %s has no attribute %s" % (
-                module.__name__, name))
-        else:
-            return attribute
+def get_attribute(obj, name):
+    """Get an attribute, raising SkipTest if AttributeError is raised."""
+    try:
+        attribute = getattr(obj, name)
+    except AttributeError:
+        raise unittest.SkipTest("module %s has no attribute %s" % (
+            obj.__name__, name))
+    else:
+        return attribute
 
 
 verbose = 1              # Flag set to 0 by regrtest.py