[pypy-svn] r76506 - in pypy/trunk/lib_pypy: . pypy_test

[agaynor at codespeak.net]

Author: agaynor
Date: Fri Aug  6 15:05:43 2010
New Revision: 76506

Modified:
   pypy/trunk/lib_pypy/pypy_test/test_coroutine.py
   pypy/trunk/lib_pypy/stackless.py
Log:
Fix for failing (and hanging) stackless and coroutine tests.

Modified: pypy/trunk/lib_pypy/pypy_test/test_coroutine.py
==============================================================================
--- pypy/trunk/lib_pypy/pypy_test/test_coroutine.py	(original)
+++ pypy/trunk/lib_pypy/pypy_test/test_coroutine.py	Fri Aug  6 15:05:43 2010
@@ -2,7 +2,7 @@
 from py.test import skip, raises
 
 try:
-    from ..stackless import coroutine
+    from ..stackless import coroutine, CoroutineExit
 except ImportError, e:
     skip('cannot import stackless: %s' % (e,))
 

Modified: pypy/trunk/lib_pypy/stackless.py
==============================================================================
--- pypy/trunk/lib_pypy/stackless.py	(original)
+++ pypy/trunk/lib_pypy/stackless.py	Fri Aug  6 15:05:43 2010
@@ -14,9 +14,11 @@
 import traceback
 import sys
 try:
-    from _stackless import coroutine, greenlet
+    from _stackless import coroutine, greenlet, CoroutineExit, TaskletExit
 except ImportError: # we are running from CPython
-    from greenlet import greenlet
+    from greenlet import greenlet, GreenletExit
+    TaskletExit = CoroutineExit = GreenletExit
+    del GreenletExit
     try:
         from functools import partial
     except ImportError: # we are not running python 2.5