[pypy-svn] r76507 - pypy/trunk/lib_pypy

[agaynor at codespeak.net]

Author: agaynor
Date: Fri Aug  6 15:23:42 2010
New Revision: 76507

Modified:
   pypy/trunk/lib_pypy/stackless.py
Log:
Remove some extraneous imports that made test_distributed fail, these are automatically available when running in a stackless enviroment.

Modified: pypy/trunk/lib_pypy/stackless.py
==============================================================================
--- pypy/trunk/lib_pypy/stackless.py	(original)
+++ pypy/trunk/lib_pypy/stackless.py	Fri Aug  6 15:23:42 2010
@@ -14,7 +14,9 @@
 import traceback
 import sys
 try:
-    from _stackless import coroutine, greenlet, CoroutineExit, TaskletExit
+    # If _stackless can be imported then TaskletExit and CoroutineExit are 
+    # automatically added to the builtins.
+    from _stackless import coroutine, greenlet
 except ImportError: # we are running from CPython
     from greenlet import greenlet, GreenletExit
     TaskletExit = CoroutineExit = GreenletExit