[pypy-commit] pypy default: Accept py.test.skip()'s exception as also meaning "skip this package" here.

arigo noreply at buildbot.pypy.org
Wed Nov 2 14:03:33 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r48657:8ed4c87f1e89
Date: 2011-11-02 14:03 +0100
http://bitbucket.org/pypy/pypy/changeset/8ed4c87f1e89/

Log:	Accept py.test.skip()'s exception as also meaning "skip this
	package" here.

diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -92,7 +92,7 @@
 
 module_import_dependencies = {
     # no _rawffi if importing pypy.rlib.clibffi raises ImportError
-    # or CompilationError
+    # or CompilationError or py.test.skip.Exception
     "_rawffi"   : ["pypy.rlib.clibffi"],
     "_ffi"      : ["pypy.rlib.clibffi"],
 
@@ -113,7 +113,7 @@
             try:
                 for name in modlist:
                     __import__(name)
-            except (ImportError, CompilationError), e:
+            except (ImportError, CompilationError, py.test.skip.Exception), e:
                 errcls = e.__class__.__name__
                 config.add_warning(
                     "The module %r is disabled\n" % (modname,) +


More information about the pypy-commit mailing list