Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r59798:1ed63b0b4127
Date: 2013-01-05 23:29 +0100
http://bitbucket.org/pypy/pypy/changeset/1ed63b0b4127/
Log: pypy.tool.cache -> rpython.rlib.cache
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -6,7 +6,7 @@
new_exception_class, typed_unwrap_error_msg)
from pypy.interpreter.argument import Arguments
from pypy.interpreter.miscutils import ThreadLocals
-from pypy.tool.cache import Cache
+from rpython.rlib.cache import Cache
from rpython.tool.uid import HUGEVAL_BYTES
from rpython.rlib import jit
from rpython.rlib.debug import make_sure_not_resized
diff --git a/pypy/tool/test/test_cache.py b/pypy/tool/test/test_cache.py
--- a/pypy/tool/test/test_cache.py
+++ b/pypy/tool/test/test_cache.py
@@ -1,4 +1,4 @@
-from pypy.tool.cache import Cache
+from rpython.rlib.cache import Cache
class MyCache(Cache):
counter = 0
diff --git a/rpython/annotator/test/test_annrpython.py
b/rpython/annotator/test/test_annrpython.py
--- a/rpython/annotator/test/test_annrpython.py
+++ b/rpython/annotator/test/test_annrpython.py
@@ -2214,7 +2214,7 @@
assert not s.is_constant()
def test_getorbuild_as_attr(self):
- from pypy.tool.cache import Cache
+ from rpython.rlib.cache import Cache
class SpaceCache(Cache):
def _build(self, callable):
return callable()
diff --git a/pypy/tool/cache.py b/rpython/rlib/cache.py
rename from pypy/tool/cache.py
rename to rpython/rlib/cache.py
diff --git a/rpython/rtyper/test/test_rpbc.py b/rpython/rtyper/test/test_rpbc.py
--- a/rpython/rtyper/test/test_rpbc.py
+++ b/rpython/rtyper/test/test_rpbc.py
@@ -359,9 +359,9 @@
# this test checks that we add a separate field
# per specialization and also it uses a subclass of
- # the standard pypy.tool.cache.Cache
+ # the standard rpython.rlib.cache.Cache
- from pypy.tool.cache import Cache
+ from rpython.rlib.cache import Cache
fr1 = Freezing()
fr2 = Freezing()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
