Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r74455:26ebcac51ad5
Date: 2014-11-11 18:47 +0100
http://bitbucket.org/pypy/pypy/changeset/26ebcac51ad5/
Log: fix some imports
diff --git a/rpython/rtyper/lltypesystem/rstr.py
b/rpython/rtyper/lltypesystem/rstr.py
--- a/rpython/rtyper/lltypesystem/rstr.py
+++ b/rpython/rtyper/lltypesystem/rstr.py
@@ -394,6 +394,7 @@
x = LLHelpers._ll_compute_strhash(s)
return x
+ @staticmethod
@jit.dont_look_inside
def _ll_compute_strhash(s):
x = _hash_string(s.chars)
diff --git a/rpython/translator/stm/inevitable.py
b/rpython/translator/stm/inevitable.py
--- a/rpython/translator/stm/inevitable.py
+++ b/rpython/translator/stm/inevitable.py
@@ -1,4 +1,5 @@
-from rpython.rtyper.lltypesystem import lltype, lloperation, rclass
+from rpython.rtyper.lltypesystem import lltype, lloperation
+from rpython.rtyper import rclass
from rpython.translator.stm.support import is_immutable
from rpython.flowspace.model import SpaceOperation, Constant
from rpython.translator.unsimplify import varoftype
diff --git a/rpython/translator/stm/test/targetdemo2.py
b/rpython/translator/stm/test/targetdemo2.py
--- a/rpython/translator/stm/test/targetdemo2.py
+++ b/rpython/translator/stm/test/targetdemo2.py
@@ -4,7 +4,8 @@
from rpython.rlib.objectmodel import we_are_translated
from rpython.rlib.objectmodel import compute_identity_hash
from rpython.rlib.debug import ll_assert
-from rpython.rtyper.lltypesystem import lltype, rffi, rclass
+from rpython.rtyper.lltypesystem import lltype, rffi
+from rpython.rtyper import rclass
class Node:
diff --git a/rpython/translator/stm/test/test_ztranslated.py
b/rpython/translator/stm/test/test_ztranslated.py
--- a/rpython/translator/stm/test/test_ztranslated.py
+++ b/rpython/translator/stm/test/test_ztranslated.py
@@ -2,8 +2,8 @@
from rpython.rlib import rstm, rgc, objectmodel
from rpython.rlib.debug import debug_print
from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
-from rpython.rtyper.lltypesystem.rclass import OBJECTPTR
from rpython.rtyper.lltypesystem.lloperation import llop
+from rpython.rtyper.rclass import OBJECTPTR
from rpython.rtyper.annlowlevel import cast_instance_to_gcref
from rpython.rtyper.annlowlevel import cast_gcref_to_instance
from rpython.translator.stm.test.support import CompiledSTMTests
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
