Fix test under PyPy

gevent/builtins.py

@@ -37,16 +37,23 @@ def __import__(*args, **kwargs):
         # however, so this is necessary.
         args = args[1:]
     imp.acquire_lock()
-    _g_import_lock.acquire()
     try:
-        result = _import(*args, **kwargs)
+        try:
+            _g_import_lock.acquire()
+        except RuntimeError:
+            # we've seen this under PyPy, a recursion error
+            # importing 'platform'
+            return _import(*args, **kwargs)
+
+        try:
+            result = _import(*args, **kwargs)
+        finally:
+            _g_import_lock.release()
     finally:
-        _g_import_lock.release()
         imp.release_lock()
     return result
 
-
-if sys.version_info[:2] < (3, 3):
+if sys.version_info[:2] >= (3, 3):
     __implements__ = []
 else:
     __implements__ = ['__import__']

greentest/test__import_blocking_in_greenlet.py

@@ -2,6 +2,7 @@
 # See https://github.com/gevent/gevent/issues/108
 import gevent
 from gevent import monkey
+
 monkey.patch_all()
 
 import_errors = []
@@ -13,6 +14,7 @@ def some_func():
         assert x == 'done'
     except ImportError as e:
         import_errors.append(e)
+        raise
 
 gs = [gevent.spawn(some_func) for i in range(2)]
 gevent.joinall(gs)

known_failures.py

@@ -59,13 +59,13 @@ if LEAKTEST:
 
 if PYPY:
     FAILING_TESTS += [
-        # Different in PyPy:
+        ## Different in PyPy:
 
-        # Not implemented:
+        ## Not implemented:
 
-        # ---
+        ## ---
 
-        # BUGS:
+        ## BUGS:
 
     ]