Author: Maciej Fijalkowski <fij...@gmail.com>
Branch:
Changeset: r63928:6cf91c47a736
Date: 2013-05-08 20:47 +0200
http://bitbucket.org/pypy/pypy/changeset/6cf91c47a736/
Log: merge
diff --git a/pypy/objspace/std/test/test_listobject.py
b/pypy/objspace/std/test/test_listobject.py
--- a/pypy/objspace/std/test/test_listobject.py
+++ b/pypy/objspace/std/test/test_listobject.py
@@ -431,10 +431,12 @@
class AppTestW_ListObject(object):
def setup_class(cls):
+ import platform
import sys
on_cpython = (cls.runappdirect and
not hasattr(sys, 'pypy_translation_info'))
cls.w_on_cpython = cls.space.wrap(on_cpython)
+ cls.w_on_arm = cls.space.wrap(platform.machine().startswith('arm'))
cls.w_runappdirect = cls.space.wrap(cls.runappdirect)
def test_getstrategyfromlist_w(self):
@@ -948,8 +950,7 @@
def test_setitem_slice_performance(self):
# because of a complexity bug, this used to take forever on a
# translated pypy. On CPython2.6 -A, it takes around 5 seconds.
- import platform
- if platform.machine().startswith('arm'):
+ if self.on_arm:
skip("consumes too much memory for most ARM machines")
if self.runappdirect:
count = 16*1024*1024
diff --git a/rpython/rlib/entrypoint.py b/rpython/rlib/entrypoint.py
--- a/rpython/rlib/entrypoint.py
+++ b/rpython/rlib/entrypoint.py
@@ -7,7 +7,7 @@
if key == 'main' than it's included by default
"""
- from rpython.translator.cbuild import ExternalCompilationInfo
+ from rpython.translator.tool.cbuild import ExternalCompilationInfo
def deco(func):
secondary_entrypoints.setdefault(key, []).append((func, argtypes))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
