[pypy-svn] r39721 - in pypy/dist/pypy/lib: . app_test

[ac at codespeak.net]

Author: ac
Date: Fri Mar  2 17:19:25 2007
New Revision: 39721

Added:
   pypy/dist/pypy/lib/stackless.py
      - copied, changed from r39714, pypy/dist/pypy/lib/stackless_new.py
Removed:
   pypy/dist/pypy/lib/stackless_new.py
Modified:
   pypy/dist/pypy/lib/app_test/test_stackless.py
   pypy/dist/pypy/lib/app_test/test_stackless_pickling.py
Log:
(stedi67, arre) Use the new and refactored stackless module as the default one.

Modified: pypy/dist/pypy/lib/app_test/test_stackless.py
==============================================================================
--- pypy/dist/pypy/lib/app_test/test_stackless.py	(original)
+++ pypy/dist/pypy/lib/app_test/test_stackless.py	Fri Mar  2 17:19:25 2007
@@ -7,14 +7,9 @@
 from py.test import skip
 try:
     import stackless
-    stackless_c = True
-    if 'coroutine' in dir(stackless):
-        stackless_c = False
-        raise ImportError("We are running pypy-c")
 except ImportError:
-    stackless_c = False
     try:
-        from pypy.lib import stackless_new as stackless
+        from pypy.lib import stackless
     except ImportError, e:
         skip('cannot import stackless: %s' % (e,))
 
@@ -24,11 +19,6 @@
     if SHOW_STRANGE:
         print txt
 
-def pypy_skip(txt):
-    "don't skip, if we are running with CStackless"
-    if not stackless_c:
-        skip(txt)
-
 class Test_Stackless:
 
     def test_simple(self):

Modified: pypy/dist/pypy/lib/app_test/test_stackless_pickling.py
==============================================================================
--- pypy/dist/pypy/lib/app_test/test_stackless_pickling.py	(original)
+++ pypy/dist/pypy/lib/app_test/test_stackless_pickling.py	Fri Mar  2 17:19:25 2007
@@ -5,14 +5,9 @@
 from py.test import skip
 try:
     import stackless
-    stackless_c = True
-    if 'coroutine' in dir(stackless):
-        stackless_c = False
-        raise ImportError("We are running pypy-c")
 except ImportError:
-    stackless_c = False
     try:
-        from pypy.lib import stackless_new as stackless
+        from pypy.lib import stackless as stackless
     except ImportError, e:
         skip('cannot import stackless: %s' % (e,))