Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r60766:519029980f3c
Date: 2013-01-31 12:47 +0100
http://bitbucket.org/pypy/pypy/changeset/519029980f3c/
Log: hg merge default (again)
diff --git a/rpython/rtyper/memory/gc/minimark.py
b/rpython/rtyper/memory/gc/minimark.py
--- a/rpython/rtyper/memory/gc/minimark.py
+++ b/rpython/rtyper/memory/gc/minimark.py
@@ -254,7 +254,7 @@
#
# The ArenaCollection() handles the nonmovable objects allocation.
if ArenaCollectionClass is None:
- from pypy.rpython.memory.gc import minimarkpage
+ from rpython.rtyper.memory.gc import minimarkpage
ArenaCollectionClass = minimarkpage.ArenaCollection
self.ac = ArenaCollectionClass(arena_size, page_size,
small_request_threshold)
diff --git a/rpython/rtyper/memory/gc/minimarktest.py
b/rpython/rtyper/memory/gc/minimarktest.py
--- a/rpython/rtyper/memory/gc/minimarktest.py
+++ b/rpython/rtyper/memory/gc/minimarktest.py
@@ -1,7 +1,7 @@
-from pypy.rpython.lltypesystem import llarena
-from pypy.rpython.lltypesystem.llmemory import raw_malloc_usage
-from pypy.rlib.debug import ll_assert
-from pypy.rlib.rarithmetic import LONG_BIT
+from rpython.rtyper.lltypesystem import llarena
+from rpython.rtyper.lltypesystem.llmemory import raw_malloc_usage
+from rpython.rlib.debug import ll_assert
+from rpython.rlib.rarithmetic import LONG_BIT
# For testing, a simple implementation of ArenaCollection.
# This version could be used together with obmalloc.c, but
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
