[Python-checkins] r70874 - python/trunk/Lib/test/test_support.py
r.david.murray
python-checkins at python.org
Tue Mar 31 21:33:15 CEST 2009
Author: r.david.murray
Date: Tue Mar 31 21:33:15 2009
New Revision: 70874
Log:
Improve test_support.import_module docstring, remove
deprecated flag from get_attribute since it isn't likely
to do anything useful.
Modified:
python/trunk/Lib/test/test_support.py
Modified: python/trunk/Lib/test/test_support.py
==============================================================================
--- python/trunk/Lib/test/test_support.py (original)
+++ python/trunk/Lib/test/test_support.py Tue Mar 31 21:33:15 2009
@@ -43,8 +43,11 @@
"""
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 @@
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
More information about the Python-checkins
mailing list