[pypy-svn] r33921 - in pypy/dist/pypy: module/_stackless module/gc objspace/cclp rlib rlib/test rpython rpython/memory/test rpython/test translator/c/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Mon Oct 30 18:33:11 2006
New Revision: 33921

Added:
   pypy/dist/pypy/rlib/rgc.py
      - copied unchanged from r33917, pypy/dist/pypy/rpython/rgc.py
   pypy/dist/pypy/rlib/test/test_rgc.py
      - copied, changed from r33917, pypy/dist/pypy/rpython/test/test_rgc.py
Removed:
   pypy/dist/pypy/rpython/rgc.py
   pypy/dist/pypy/rpython/test/test_rgc.py
Modified:
   pypy/dist/pypy/module/_stackless/clonable.py
   pypy/dist/pypy/module/_stackless/interp_clonable.py
   pypy/dist/pypy/module/gc/interp_gc.py
   pypy/dist/pypy/objspace/cclp/space.py
   pypy/dist/pypy/rpython/memory/test/test_transformed_gc.py
   pypy/dist/pypy/translator/c/test/test_newgc.py
Log:
move rgc


Modified: pypy/dist/pypy/module/_stackless/clonable.py
==============================================================================
--- pypy/dist/pypy/module/_stackless/clonable.py	(original)
+++ pypy/dist/pypy/module/_stackless/clonable.py	Mon Oct 30 18:33:11 2006
@@ -2,7 +2,7 @@
 from pypy.module._stackless.interp_clonable import InterpClonableCoroutine
 
 from pypy.rpython.objectmodel import we_are_translated
-from pypy.rpython.rgc import gc_swap_pool, gc_clone
+from pypy.rlib.rgc import gc_swap_pool, gc_clone
 
 from pypy.module._stackless.stackless_flags import StacklessFlags
 from pypy.interpreter.function import StaticMethod

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	Mon Oct 30 18:33:11 2006
@@ -1,5 +1,5 @@
 from pypy.module._stackless.interp_coroutine import AbstractThunk, BaseCoState, Coroutine
-from pypy.rpython.rgc import gc_swap_pool, gc_clone
+from pypy.rlib.rgc import gc_swap_pool, gc_clone
 from pypy.rpython.objectmodel import we_are_translated
 
 from pypy.interpreter.error import OperationError

Modified: pypy/dist/pypy/module/gc/interp_gc.py
==============================================================================
--- pypy/dist/pypy/module/gc/interp_gc.py	(original)
+++ pypy/dist/pypy/module/gc/interp_gc.py	Mon Oct 30 18:33:11 2006
@@ -1,5 +1,5 @@
 from pypy.interpreter.gateway import ObjSpace
-from pypy.rpython import rgc # Force registration of gc.collect
+from pypy.rlib import rgc # Force registration of gc.collect
 import gc
 
 def collect(space):

Modified: pypy/dist/pypy/objspace/cclp/space.py
==============================================================================
--- pypy/dist/pypy/objspace/cclp/space.py	(original)
+++ pypy/dist/pypy/objspace/cclp/space.py	Mon Oct 30 18:33:11 2006
@@ -20,7 +20,7 @@
 from pypy.objspace.cclp.constraint.distributor import distribute
 from pypy.objspace.cclp.scheduler import W_ThreadGroupScheduler
 
-from pypy.rpython.rgc import gc_swap_pool, gc_clone
+from pypy.rlib.rgc import gc_swap_pool, gc_clone
 
 def newspace(space, w_callable, __args__):
     "application level creation of a new computation space"

Modified: pypy/dist/pypy/rpython/memory/test/test_transformed_gc.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/test/test_transformed_gc.py	(original)
+++ pypy/dist/pypy/rpython/memory/test/test_transformed_gc.py	Mon Oct 30 18:33:11 2006
@@ -492,7 +492,7 @@
         assert res == 22220221
 
     def test_cloning_highlevel(self):
-        from pypy.rpython import rgc
+        from pypy.rlib import rgc
         class A:
             pass
         class B(A):
@@ -526,7 +526,7 @@
         assert res == 1
 
     def test_cloning_highlevel_varsize(self):
-        from pypy.rpython import rgc
+        from pypy.rlib import rgc
         class A:
             pass
         def func(n, dummy):

Modified: pypy/dist/pypy/translator/c/test/test_newgc.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_newgc.py	(original)
+++ pypy/dist/pypy/translator/c/test/test_newgc.py	Mon Oct 30 18:33:11 2006
@@ -377,7 +377,7 @@
 
 def test_gc_x_operations():
     t = TranslationContext()
-    from pypy.rpython.rgc import gc_clone, gc_swap_pool
+    from pypy.rlib.rgc import gc_clone, gc_swap_pool
     S = lltype.GcStruct("S", ('x', lltype.Signed))
     def f():
         s = lltype.malloc(S)
@@ -799,7 +799,7 @@
     def test_memory_error_varsize(self):
         py.test.skip("Needs lots (>2GB) of memory.")
         import gc
-        import pypy.rpython.rgc
+        import pypy.rlib.rgc
         from pypy.rpython.lltypesystem import lltype
         N = sys.maxint / 4 + 4
         A = lltype.GcArray(lltype.Signed)