[pypy-svn] r28734 - in pypy/dist/pypy: lib module/_stackless module/_stackless/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Jun 13 11:17:24 2006
New Revision: 28734

Added:
   pypy/dist/pypy/lib/stackless.py
      - copied, changed from r28733, pypy/dist/pypy/module/_stackless/test/stackless_.py
Removed:
   pypy/dist/pypy/module/_stackless/test/stackless_.py
Modified:
   pypy/dist/pypy/module/_stackless/__init__.py
   pypy/dist/pypy/module/_stackless/coroutine.py
   pypy/dist/pypy/module/_stackless/interp_clonable.py
   pypy/dist/pypy/module/_stackless/test/test_coroutine.py
   pypy/dist/pypy/module/_stackless/test/test_interp_clonable.py
   pypy/dist/pypy/module/_stackless/test/test_interp_coroutine.py
   pypy/dist/pypy/module/_stackless/test/test_stackless.py
Log:
fix imports and add lib/stackless.py


Modified: pypy/dist/pypy/module/_stackless/__init__.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/__init__.py	(original)
+++ pypy/dist/pypy/module/_stackless/__init__.py	Tue Jun 13 11:17:24 2006
@@ -17,5 +17,5 @@
     def setup_after_space_initialization(self):
         # post-installing classmethods/staticmethods which
         # are not yet directly supported
-        from pypy.module.stackless.coroutine import post_install
+        from pypy.module._stackless.coroutine import post_install
         post_install(self)

Modified: pypy/dist/pypy/module/_stackless/coroutine.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/coroutine.py	(original)
+++ pypy/dist/pypy/module/_stackless/coroutine.py	Tue Jun 13 11:17:24 2006
@@ -23,8 +23,8 @@
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.function import StaticMethod
 
-from pypy.module.stackless.stackless_flags import StacklessFlags
-from pypy.module.stackless.interp_coroutine import Coroutine, BaseCoState, AbstractThunk
+from pypy.module._stackless.stackless_flags import StacklessFlags
+from pypy.module._stackless.interp_coroutine import Coroutine, BaseCoState, AbstractThunk
 
 from pypy.rpython import rstack # for resume points
 from pypy.tool import stdlib_opcode as pythonopcode
@@ -120,7 +120,7 @@
         # you cannot construct the tree that you are climbing.
         # XXX missing checks!
         from pypy.interpreter.mixedmodule import MixedModule
-        w_mod    = space.getbuiltinmodule('stackless')
+        w_mod    = space.getbuiltinmodule('_stackless')
         mod      = space.interp_w(MixedModule, w_mod)
         w_mod2    = space.getbuiltinmodule('_pickle_support')
         mod2      = space.interp_w(MixedModule, w_mod2)
@@ -247,7 +247,7 @@
                               unwrap_spec=['self', ObjSpace]),
     __setstate__ = interp2app(AppCoroutine.descr__setstate__,
                               unwrap_spec=['self', ObjSpace, W_Root]),
-    __module__ = 'stackless',
+    __module__ = '_stackless',
 )
 
 class AppCoState(BaseCoState):

Modified: pypy/dist/pypy/module/_stackless/interp_clonable.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/interp_clonable.py	(original)
+++ pypy/dist/pypy/module/_stackless/interp_clonable.py	Tue Jun 13 11:17:24 2006
@@ -1,4 +1,4 @@
-from pypy.module.stackless.interp_coroutine import Coroutine, AbstractThunk
+from pypy.module._stackless.interp_coroutine import Coroutine, AbstractThunk
 from pypy.rpython.rgc import gc_swap_pool, gc_clone
 
 

Modified: pypy/dist/pypy/module/_stackless/test/test_coroutine.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/test/test_coroutine.py	(original)
+++ pypy/dist/pypy/module/_stackless/test/test_coroutine.py	Tue Jun 13 11:17:24 2006
@@ -5,11 +5,11 @@
 class AppTest_Coroutine:
 
     def setup_class(cls):
-        space = gettestobjspace(usemodules=('stackless',))
+        space = gettestobjspace(usemodules=('_stackless',))
         cls.space = space
 
     def test_one(self):
-        import stackless
+        import _stackless as stackless
         print stackless.__file__
         co = stackless.coroutine()
         print co
@@ -19,7 +19,7 @@
     def test_pickle_coroutine(self):
         # this test is limited to basic pickling.
         # real stacks can only tested with a stackless pypy build.
-        import stackless
+        import _stackless as stackless
         co = stackless.coroutine()
         import pickle
         pckl = pickle.dumps(co)
@@ -33,7 +33,7 @@
         try: 
             sys.modules['mod'] = mod
             exec '''
-import sys, stackless
+import sys, _stackless as stackless
 
 def f():
         global the_frame

Modified: pypy/dist/pypy/module/_stackless/test/test_interp_clonable.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/test/test_interp_clonable.py	(original)
+++ pypy/dist/pypy/module/_stackless/test/test_interp_clonable.py	Tue Jun 13 11:17:24 2006
@@ -5,8 +5,8 @@
 from pypy.translator.c import gc
 from pypy.rpython.memory import gctransform
 from pypy.rpython.memory.test import test_transformed_gc
-from pypy.module.stackless.interp_clonable import ClonableCoroutine
-from pypy.module.stackless.interp_clonable import AbstractThunk, fork
+from pypy.module._stackless.interp_clonable import ClonableCoroutine
+from pypy.module._stackless.interp_clonable import AbstractThunk, fork
 
 
 class TestClonableCoroutine(test_transformed_gc.GCTest):

Modified: pypy/dist/pypy/module/_stackless/test/test_interp_coroutine.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/test/test_interp_coroutine.py	(original)
+++ pypy/dist/pypy/module/_stackless/test/test_interp_coroutine.py	Tue Jun 13 11:17:24 2006
@@ -3,7 +3,7 @@
 """
 
 import os
-from pypy.module.stackless.interp_coroutine import main_costate_getter, Coroutine, AbstractThunk
+from pypy.module._stackless.interp_coroutine import main_costate_getter, Coroutine, AbstractThunk
 from pypy.translator.c.test.test_stackless import StacklessTest
 from pypy.translator.c import gc
 

Modified: pypy/dist/pypy/module/_stackless/test/test_stackless.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/test/test_stackless.py	(original)
+++ pypy/dist/pypy/module/_stackless/test/test_stackless.py	Tue Jun 13 11:17:24 2006
@@ -3,7 +3,7 @@
 class AppTest_Stackless:
 
     def setup_class(cls):
-        space = gettestobjspace(usemodules=('stackless',))
+        space = gettestobjspace(usemodules=('_stackless',))
         cls.space = space
 
     def test_one(self):