[pypy-commit] pypy default: Avoid unnecessary dependency on py.test

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r80621:3a7694159dfb
Date: 2015-11-10 19:43 +0000
http://bitbucket.org/pypy/pypy/changeset/3a7694159dfb/

Log:	Avoid unnecessary dependency on py.test

diff --git a/rpython/rlib/rgc.py b/rpython/rlib/rgc.py
--- a/rpython/rlib/rgc.py
+++ b/rpython/rlib/rgc.py
@@ -46,7 +46,7 @@
     """
     _pinned_objects.append(obj)
     return True
-        
+
 
 class PinEntry(ExtRegistryEntry):
     _about_ = pin
@@ -533,12 +533,8 @@
 def _fetch_ffi():
     global _ffi_cache
     if _ffi_cache is None:
-        try:
-            import _cffi_backend
-            _ffi_cache = _cffi_backend.FFI()
-        except (ImportError, AttributeError):
-            import py
-            py.test.skip("need CFFI >= 1.0")
+        import _cffi_backend
+        _ffi_cache = _cffi_backend.FFI()
     return _ffi_cache
 
 @jit.dont_look_inside
@@ -816,7 +812,7 @@
             pending.extend(get_rpy_referents(gcref))
 
 all_typeids = {}
-        
+
 def get_typeid(obj):
     raise Exception("does not work untranslated")