[pypy-svn] r46878 - in pypy/dist/pypy/module/_stackless: . test

tismer at codespeak.net tismer at codespeak.net
Tue Sep 25 21:27:07 CEST 2007


Author: tismer
Date: Tue Sep 25 21:27:07 2007
New Revision: 46878

Added:
   pypy/dist/pypy/module/_stackless/interp_composable_coroutine
      - copied unchanged from r46862, pypy/dist/pypy/module/_stackless/composable_coroutine.py
   pypy/dist/pypy/module/_stackless/interp_composable_coroutine.py
      - copied, changed from r46862, pypy/dist/pypy/module/_stackless/composable_coroutine.py
   pypy/dist/pypy/module/_stackless/interp_coroutine.py
      - copied, changed from r46862, pypy/dist/pypy/module/_stackless/coroutine.py
Removed:
   pypy/dist/pypy/module/_stackless/composable_coroutine.py
   pypy/dist/pypy/module/_stackless/coroutine.py
Modified:
   pypy/dist/pypy/module/_stackless/__init__.py
   pypy/dist/pypy/module/_stackless/interp_clonable.py
   pypy/dist/pypy/module/_stackless/interp_greenlet.py
   pypy/dist/pypy/module/_stackless/test/test_choicepoint.py
   pypy/dist/pypy/module/_stackless/test/test_interp_clonable.py
   pypy/dist/pypy/module/_stackless/test/test_interp_coroutine.py
Log:
renaming and reorganizing the _stackless folder. test renaming goes next, needed to check-in

Modified: pypy/dist/pypy/module/_stackless/__init__.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/__init__.py	(original)
+++ pypy/dist/pypy/module/_stackless/__init__.py	Tue Sep 25 21:27:07 2007
@@ -13,16 +13,16 @@
 
     interpleveldefs = {
         'tasklet'    : 'interp_stackless.tasklet',
-        'coroutine'  : 'coroutine.AppCoroutine',
+        'coroutine'  : 'interp_coroutine.AppCoroutine',
         'greenlet'   : 'interp_greenlet.AppGreenlet',
-        'usercostate': 'composable_coroutine.W_UserCoState',
-        '_return_main' : 'coroutine.return_main',
+        'usercostate': 'interp_composable_coroutine.W_UserCoState',
+        '_return_main' : 'interp_coroutine.return_main',
     }
 
     def setup_after_space_initialization(self):
         # post-installing classmethods/staticmethods which
         # are not yet directly supported
-        from pypy.module._stackless.coroutine import post_install as post_install_coro
+        from pypy.module._stackless.interp_coroutine import post_install as post_install_coro
         post_install_coro(self)
         from pypy.module._stackless.interp_greenlet import post_install as post_install_greenlet
         post_install_greenlet(self)

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 Sep 25 21:27:07 2007
@@ -1,9 +1,9 @@
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.typedef import TypeDef
 from pypy.interpreter.gateway import interp2app, ObjSpace, W_Root
-from pypy.module._stackless.coroutine import AppCoroutine, AppCoState
-from pypy.module._stackless.coroutine import makeStaticMethod
-from pypy.module._stackless.interp_coroutine import AbstractThunk
+from pypy.module._stackless.interp_coroutine import AppCoroutine, AppCoState
+from pypy.module._stackless.interp_coroutine import makeStaticMethod
+from pypy.rlib.rcoroutine import AbstractThunk
 from pypy.module._stackless.rclonable import InterpClonableMixin
 
 

Modified: pypy/dist/pypy/module/_stackless/interp_greenlet.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/interp_greenlet.py	(original)
+++ pypy/dist/pypy/module/_stackless/interp_greenlet.py	Tue Sep 25 21:27:07 2007
@@ -4,9 +4,9 @@
 from pypy.interpreter.gateway import NoneNotWrapped
 from pypy.interpreter.error import OperationError
 
-from pypy.module._stackless.interp_coroutine import Coroutine, BaseCoState
-from pypy.module._stackless.interp_coroutine import AbstractThunk, syncstate
-from pypy.module._stackless.coroutine import makeStaticMethod
+from pypy.rlib.rcoroutine import Coroutine, BaseCoState
+from pypy.rlib.rcoroutine import AbstractThunk, syncstate
+from pypy.module._stackless.interp_coroutine import makeStaticMethod
 
 
 class GreenletThunk(AbstractThunk):

Modified: pypy/dist/pypy/module/_stackless/test/test_choicepoint.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/test/test_choicepoint.py	(original)
+++ pypy/dist/pypy/module/_stackless/test/test_choicepoint.py	Tue Sep 25 21:27:07 2007
@@ -1,5 +1,5 @@
-from pypy.module._stackless.interp_coroutine import AbstractThunk
-from pypy.module._stackless.interp_clonable import InterpClonableCoroutine as ClonableCoroutine
+from pypy.rlib.rcoroutine import AbstractThunk
+from pypy.module._stackless.rclonable import InterpClonableCoroutine as ClonableCoroutine
 
 class ChoicePointHolder(object):
     def __init__(self):

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 Sep 25 21:27:07 2007
@@ -6,8 +6,8 @@
 from pypy.translator.c import gc
 from pypy.rpython.memory.gctransform import stacklessframework
 from pypy.rpython.memory.test import test_transformed_gc
-from pypy.module._stackless.interp_clonable import InterpClonableCoroutine as ClonableCoroutine
-from pypy.module._stackless.interp_clonable import AbstractThunk, fork
+from pypy.module._stackless.rclonable import InterpClonableCoroutine as ClonableCoroutine
+from pypy.module._stackless.rclonable 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 Sep 25 21:27:07 2007
@@ -4,7 +4,7 @@
 
 import os
 from pypy import conftest; conftest.translation_test_so_skip_if_appdirect()
-from pypy.module._stackless.interp_coroutine import syncstate, Coroutine, AbstractThunk
+from pypy.rlib.rcoroutine import syncstate, Coroutine, AbstractThunk
 from pypy.translator.c.test.test_stackless import StacklessTest
 from pypy.translator.c import gc
 



More information about the Pypy-commit mailing list