[Python-checkins] r74559 - python/branches/py3k/Lib/importlib/test/import_/util.py

[brett.cannon]

Author: brett.cannon
Date: Fri Aug 28 01:44:18 2009
New Revision: 74559

Log:
Move a test-skipping decorator over to unittest.skipIf.

Modified:
   python/branches/py3k/Lib/importlib/test/import_/util.py

Modified: python/branches/py3k/Lib/importlib/test/import_/util.py
==============================================================================
--- python/branches/py3k/Lib/importlib/test/import_/util.py	(original)
+++ python/branches/py3k/Lib/importlib/test/import_/util.py	Fri Aug 28 01:44:18 2009
@@ -1,5 +1,7 @@
 import functools
+import importlib
 import importlib._bootstrap
+import unittest
 
 
 using___import__ = False
@@ -13,16 +15,7 @@
         return importlib._bootstrap.__import__(*args, **kwargs)
 
 
-def importlib_only(fxn):
-    """Decorator to mark which tests are not supported by the current
-    implementation of __import__()."""
-    def inner(*args, **kwargs):
-        if using___import__:
-            return
-        else:
-            return fxn(*args, **kwargs)
-    functools.update_wrapper(inner, fxn)
-    return inner
+importlib_only = unittest.skipIf(using___import__, "importlib-specific test")
 
 
 def mock_path_hook(*entries, importer):