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

[stephan at codespeak.net]

Author: stephan
Date: Fri Dec 15 15:59:41 2006
New Revision: 35805

Added:
   pypy/dist/pypy/lib/app_test/
   pypy/dist/pypy/lib/app_test/__init__.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/__init__.py
   pypy/dist/pypy/lib/app_test/autopath.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/autopath.py
   pypy/dist/pypy/lib/app_test/inprogress_test_binascii_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/inprogress_test_binascii_extra.py
   pypy/dist/pypy/lib/app_test/no_test_pickle_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/no_test_pickle_extra.py
   pypy/dist/pypy/lib/app_test/test_binascii.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_binascii.py
   pypy/dist/pypy/lib/app_test/test_coroutine.py
      - copied, changed from r35745, user/stephan/hacks/coroutine/test/test_coroutine.py
   pypy/dist/pypy/lib/app_test/test_deque_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_deque_extra.py
   pypy/dist/pypy/lib/app_test/test_exception_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_exception_extra.py
   pypy/dist/pypy/lib/app_test/test_exceptions_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_exceptions_extra.py
   pypy/dist/pypy/lib/app_test/test_imp_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_imp_extra.py
   pypy/dist/pypy/lib/app_test/test_marshal_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_marshal_extra.py
   pypy/dist/pypy/lib/app_test/test_md5_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_md5_extra.py
   pypy/dist/pypy/lib/app_test/test_runpy.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_runpy.py
   pypy/dist/pypy/lib/app_test/test_sha_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_sha_extra.py
   pypy/dist/pypy/lib/app_test/test_stackless.py
      - copied, changed from r35791, pypy/dist/pypy/module/_stackless/test/test_stackless.py
   pypy/dist/pypy/lib/app_test/test_string_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_string_extra.py
   pypy/dist/pypy/lib/app_test/test_struct_extra.py
      - copied unchanged from r35791, pypy/dist/pypy/lib/test2/test_struct_extra.py
Removed:
   pypy/dist/pypy/lib/test2/inprogress_test_binascii_extra.py
   pypy/dist/pypy/lib/test2/no_test_pickle_extra.py
   pypy/dist/pypy/lib/test2/test_binascii.py
   pypy/dist/pypy/lib/test2/test_deque_extra.py
   pypy/dist/pypy/lib/test2/test_exception_extra.py
   pypy/dist/pypy/lib/test2/test_exceptions_extra.py
   pypy/dist/pypy/lib/test2/test_imp_extra.py
   pypy/dist/pypy/lib/test2/test_marshal_extra.py
   pypy/dist/pypy/lib/test2/test_md5_extra.py
   pypy/dist/pypy/lib/test2/test_runpy.py
   pypy/dist/pypy/lib/test2/test_sha_extra.py
   pypy/dist/pypy/lib/test2/test_string_extra.py
   pypy/dist/pypy/lib/test2/test_struct_extra.py
Modified:
   pypy/dist/pypy/lib/stackless.py
   pypy/dist/pypy/lib/stackless_new.py
Log:
created new 'app_test' directory in pypy/lib and moved all application
level tests from 'test2'.
moved module/_stackless/test/test_stackless.py into app_test
added test_coroutine.py.
test_coroutine should run with pypy-c and CPython (with fresh py lib 
checkout). test_stackless should run with CPython, CStackless and 
pypy-c. (pypy-c must be compiled with stackless support, of course)


Modified: pypy/dist/pypy/lib/stackless.py
==============================================================================
--- pypy/dist/pypy/lib/stackless.py	(original)
+++ pypy/dist/pypy/lib/stackless.py	Fri Dec 15 15:59:41 2006
@@ -15,7 +15,10 @@
 
 switches = 0
 
-from _stackless import coroutine, greenlet
+try:
+    from _stackless import coroutine, greenlet
+except ImportError:
+    from py.magic import coroutine, greenlet
 
 __all__ = 'run getcurrent getmain schedule tasklet \
                 channel TaskletExit coroutine greenlet'.split()

Modified: pypy/dist/pypy/lib/stackless_new.py
==============================================================================
--- pypy/dist/pypy/lib/stackless_new.py	(original)
+++ pypy/dist/pypy/lib/stackless_new.py	Fri Dec 15 15:59:41 2006
@@ -6,7 +6,10 @@
 
 import traceback
 import sys
-from _stackless import coroutine, greenlet
+try:
+    from _stackless import coroutine, greenlet
+except ImportError:
+    from py.magic import coroutine, greenlet
 from collections import deque
 
 __all__ = 'run getcurrent getmain schedule tasklet channel coroutine \