[pypy-commit] pypy gc-del: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: gc-del
Changeset: r63645:49fa8123b5eb
Date: 2013-04-26 15:19 +0200
http://bitbucket.org/pypy/pypy/changeset/49fa8123b5eb/

Log:	hg merge default

diff --git a/rpython/memory/test/test_generational_gc.py b/rpython/memory/test/test_generational_gc.py
--- a/rpython/memory/test/test_generational_gc.py
+++ b/rpython/memory/test/test_generational_gc.py
@@ -1,4 +1,4 @@
-from rpython.memory.test.test_semispace_gc import TestSemiSpaceGC
+from rpython.memory.test import test_semispace_gc
 
-class TestGenerationalGC(TestSemiSpaceGC):
+class TestGenerationalGC(test_semispace_gc.TestSemiSpaceGC):
     from rpython.memory.gc.generation import GenerationGC as GCClass
diff --git a/rpython/memory/test/test_growingsemispace_gc.py b/rpython/memory/test/test_growingsemispace_gc.py
--- a/rpython/memory/test/test_growingsemispace_gc.py
+++ b/rpython/memory/test/test_growingsemispace_gc.py
@@ -1,8 +1,8 @@
 from rpython.rlib.rarithmetic import LONG_BIT
 
-from rpython.memory.test.test_semispace_gc import TestSemiSpaceGC
+from rpython.memory.test import test_semispace_gc
 
 WORD = LONG_BIT // 8
 
-class TestGrowingSemiSpaceGC(TestSemiSpaceGC):
+class TestGrowingSemiSpaceGC(test_semispace_gc.TestSemiSpaceGC):
     GC_PARAMS = {'space_size': 16*WORD}
diff --git a/rpython/memory/test/test_hybrid_gc.py b/rpython/memory/test/test_hybrid_gc.py
--- a/rpython/memory/test/test_hybrid_gc.py
+++ b/rpython/memory/test/test_hybrid_gc.py
@@ -4,10 +4,10 @@
 from rpython.rtyper.lltypesystem import lltype
 from rpython.rtyper.lltypesystem.lloperation import llop
 
-from rpython.memory.test.test_generational_gc import TestGenerationalGC
+from rpython.memory.test import test_generational_gc
 
 
-class TestHybridGC(TestGenerationalGC):
+class TestHybridGC(test_generational_gc.TestGenerationalGC):
     from rpython.memory.gc.hybrid import HybridGC as GCClass
     GC_CAN_MALLOC_NONMOVABLE = True
     GC_CAN_SHRINK_BIG_ARRAY = False
diff --git a/rpython/memory/test/test_minimark_gc.py b/rpython/memory/test/test_minimark_gc.py
--- a/rpython/memory/test/test_minimark_gc.py
+++ b/rpython/memory/test/test_minimark_gc.py
@@ -2,11 +2,11 @@
 from rpython.rlib import rgc
 from rpython.rtyper.lltypesystem.lloperation import llop
 
-from rpython.memory.test.test_semispace_gc import TestSemiSpaceGC
+from rpython.memory.test import test_semispace_gc
 
 WORD = LONG_BIT // 8
 
-class TestMiniMarkGC(TestSemiSpaceGC):
+class TestMiniMarkGC(test_semispace_gc.TestSemiSpaceGC):
     from rpython.memory.gc.minimark import MiniMarkGC as GCClass
     GC_CAN_SHRINK_BIG_ARRAY = False
     GC_CAN_MALLOC_NONMOVABLE = True
diff --git a/rpython/memory/test/test_minimark_gc_cardmarking.py b/rpython/memory/test/test_minimark_gc_cardmarking.py
--- a/rpython/memory/test/test_minimark_gc_cardmarking.py
+++ b/rpython/memory/test/test_minimark_gc_cardmarking.py
@@ -1,6 +1,6 @@
-from rpython.memory.test.test_minimark_gc import TestMiniMarkGC
+from rpython.memory.test import test_minimark_gc
 
-class TestMiniMarkGCCardMarking(TestMiniMarkGC):
+class TestMiniMarkGCCardMarking(test_minimark_gc.TestMiniMarkGC):
     GC_PARAMS = {'card_page_indices': 4}
 
     def test_finalizer_with_card_marks_array(self):