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

@@ -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,18 +59,13 @@ 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)
+def get_attribute(obj, name):
+    """Get an attribute, raising SkipTest if AttributeError is raised."""
     try:
-            attribute = getattr(module, name)
+        attribute = getattr(obj, name)
     except AttributeError:
         raise unittest.SkipTest("module %s has no attribute %s" % (
-                module.__name__, name))
+            obj.__name__, name))
     else:
         return attribute