Author: Tobias Pape <[email protected]>
Branch:
Changeset: r20:ee61936862c8
Date: 2013-01-24 14:26 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/ee61936862c8/
Log: Cope for rpython split
diff --git a/spyvm/fixedstack.py b/spyvm/fixedstack.py
--- a/spyvm/fixedstack.py
+++ b/spyvm/fixedstack.py
@@ -4,7 +4,7 @@
import types
-from pypy.rlib.rarithmetic import r_uint
+from rpython.rlib.rarithmetic import r_uint
class FixedStack(object):
_annspecialcase_ = "specialize:ctr_location" # polymorphic
diff --git a/spyvm/interpreter.py b/spyvm/interpreter.py
--- a/spyvm/interpreter.py
+++ b/spyvm/interpreter.py
@@ -5,7 +5,7 @@
from spyvm import conftest
from spyvm import wrapper
-from pypy.rlib import objectmodel, unroll
+from rpython.rlib import objectmodel, unroll
class MissingBytecode(Exception):
"""Bytecode not implemented yet."""
diff --git a/spyvm/model.py b/spyvm/model.py
--- a/spyvm/model.py
+++ b/spyvm/model.py
@@ -18,10 +18,10 @@
from spyvm.tool.bitmanipulation import splitter
from spyvm import constants, error
-from pypy.rlib import rrandom, objectmodel
-from pypy.rlib.rarithmetic import intmask, r_uint
-from pypy.tool.pairtype import extendabletype
-from pypy.rlib.objectmodel import instantiate
+from rpython.rlib import rrandom, objectmodel
+from rpython.rlib.rarithmetic import intmask, r_uint
+from rpython.tool.pairtype import extendabletype
+from rpython.rlib.objectmodel import instantiate
class W_Object(object):
"""Root of Squeak model, abstract."""
diff --git a/spyvm/objspace.py b/spyvm/objspace.py
--- a/spyvm/objspace.py
+++ b/spyvm/objspace.py
@@ -2,8 +2,8 @@
from spyvm import model
from spyvm import shadow
from spyvm.error import UnwrappingError, WrappingError
-from pypy.rlib.objectmodel import instantiate
-from pypy.rlib.rarithmetic import intmask, r_uint
+from rpython.rlib.objectmodel import instantiate
+from rpython.rlib.rarithmetic import intmask, r_uint
class ObjSpace(object):
def __init__(self):
diff --git a/spyvm/primitives.py b/spyvm/primitives.py
--- a/spyvm/primitives.py
+++ b/spyvm/primitives.py
@@ -7,7 +7,7 @@
PrimitiveNotYetWrittenError
from spyvm import wrapper
-from pypy.rlib import rarithmetic, rfloat, unroll
+from rpython.rlib import rarithmetic, rfloat, unroll
def assert_bounds(n0, minimum, maximum):
if not minimum <= n0 < maximum:
@@ -45,7 +45,7 @@
def expose_primitive(code, unwrap_spec=None, no_result=False):
# some serious magic, don't look
- from pypy.rlib.unroll import unrolling_iterable
+ from rpython.rlib.unroll import unrolling_iterable
# heuristics to give it a nice name
name = None
for key, value in globals().iteritems():
@@ -620,7 +620,7 @@
@expose_primitive(INC_GC, unwrap_spec=[object])
@expose_primitive(FULL_GC, unwrap_spec=[object])
def func(interp, w_arg): # Squeak pops the arg and ignores it ... go figure
- from pypy.rlib import rgc
+ from rpython.rlib import rgc
rgc.collect()
return fake_bytes_left(interp)
diff --git a/spyvm/shadow.py b/spyvm/shadow.py
--- a/spyvm/shadow.py
+++ b/spyvm/shadow.py
@@ -1,7 +1,7 @@
import weakref
from spyvm import model, constants, error
-from pypy.tool.pairtype import extendabletype
-from pypy.rlib import rarithmetic
+from rpython.tool.pairtype import extendabletype
+from rpython.rlib import rarithmetic
class AbstractShadow(object):
"""A shadow is an optional extra bit of information that
diff --git a/spyvm/squeakimage.py b/spyvm/squeakimage.py
--- a/spyvm/squeakimage.py
+++ b/spyvm/squeakimage.py
@@ -4,7 +4,7 @@
from spyvm import model
from spyvm.tool.bitmanipulation import splitter
-from pypy.rlib import objectmodel
+from rpython.rlib import objectmodel
def chrs2int(b):
assert len(b) == 4
@@ -360,7 +360,7 @@
w_pointersobject.hash = self.chunk.hash12
def fillin_wordsobject(self, w_wordsobject):
- from pypy.rlib.rarithmetic import r_uint
+ from rpython.rlib.rarithmetic import r_uint
w_wordsobject.words = [r_uint(x) for x in self.chunk.data]
w_class = self.g_class.w_object
assert isinstance(w_class, model.W_PointersObject)
diff --git a/spyvm/test/test_objectspace.py b/spyvm/test/test_objectspace.py
--- a/spyvm/test/test_objectspace.py
+++ b/spyvm/test/test_objectspace.py
@@ -27,7 +27,7 @@
assert w_Metaclass.w_class.w_class is w_Metaclass
def test_ruint():
- from pypy.rlib.rarithmetic import r_uint
+ from rpython.rlib.rarithmetic import r_uint
import sys
for num in [0, 1, 41, 100, 2**31, sys.maxint + 1]:
num = r_uint(num)
diff --git a/spyvm/test/test_primitives.py b/spyvm/test/test_primitives.py
--- a/spyvm/test/test_primitives.py
+++ b/spyvm/test/test_primitives.py
@@ -6,7 +6,7 @@
from spyvm import primitives
from spyvm import objspace
-from pypy.rlib.rfloat import INFINITY, NAN, isinf, isnan
+from rpython.rlib.rfloat import INFINITY, NAN, isinf, isnan
mockclass = objspace.bootstrap_class
diff --git a/spyvm/tool/bitmanipulation.py b/spyvm/tool/bitmanipulation.py
--- a/spyvm/tool/bitmanipulation.py
+++ b/spyvm/tool/bitmanipulation.py
@@ -1,4 +1,4 @@
-from pypy.rlib import unroll
+from rpython.rlib import unroll
class BitSplitter(dict):
def __getitem__(self, lengths):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
