[pypy-commit] pypy py3k: skip when _testcapi ImportErrors

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r64370:4214388aa89b
Date: 2013-05-20 12:30 -0700
http://bitbucket.org/pypy/pypy/changeset/4214388aa89b/

Log:	skip when _testcapi ImportErrors

diff --git a/lib-python/3/importlib/test/extension/test_finder.py b/lib-python/3/importlib/test/extension/test_finder.py
--- a/lib-python/3/importlib/test/extension/test_finder.py
+++ b/lib-python/3/importlib/test/extension/test_finder.py
@@ -8,6 +8,7 @@
 
     """Test the finder for extension modules."""
 
+    @util.skip_unless__testcapi
     def find_module(self, fullname):
         importer = _bootstrap._FileFinder(util.PATH,
                                           _bootstrap._ExtensionFinderDetails())
diff --git a/lib-python/3/importlib/test/extension/test_loader.py b/lib-python/3/importlib/test/extension/test_loader.py
--- a/lib-python/3/importlib/test/extension/test_loader.py
+++ b/lib-python/3/importlib/test/extension/test_loader.py
@@ -11,6 +11,7 @@
 
     """Test load_module() for extension modules."""
 
+    @ext_util.skip_unless__testcapi
     def load_module(self, fullname):
         loader = _bootstrap._ExtensionFileLoader(ext_util.NAME,
                                                 ext_util.FILEPATH)
diff --git a/lib-python/3/importlib/test/extension/util.py b/lib-python/3/importlib/test/extension/util.py
--- a/lib-python/3/importlib/test/extension/util.py
+++ b/lib-python/3/importlib/test/extension/util.py
@@ -1,6 +1,7 @@
 import imp
 import os
 import sys
+import unittest
 
 PATH = None
 EXT = None
@@ -27,3 +28,8 @@
 except StopIteration:
     pass
 del _file_exts
+
+
+def skip_unless__testcapi(func):
+    msg = "Requires the CPython C Extension API ({!r} module)".format(NAME)
+    return unittest.skipUnless(PATH, msg)(func)