Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r59995:11426dcd2a68
Date: 2013-01-12 20:10 +0100
http://bitbucket.org/pypy/pypy/changeset/11426dcd2a68/
Log: get_pypy_config -> get_combined_translation_config
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_util.py
b/rpython/jit/metainterp/optimizeopt/test/test_util.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_util.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_util.py
@@ -18,7 +18,7 @@
from rpython.jit.metainterp.quasiimmut import QuasiImmutDescr
from rpython.jit.metainterp import compile, resume, history
from rpython.jit.metainterp.jitprof import EmptyProfiler
-from pypy.config.pypyoption import get_pypy_config
+from rpython.config.translationoption import get_combined_translation_config
from rpython.jit.metainterp.resoperation import rop, opname, ResOperation
from rpython.jit.metainterp.optimizeopt.unroll import Inliner
@@ -345,7 +345,7 @@
self.profiler = EmptyProfiler()
self.options = Fake()
self.globaldata = Fake()
- self.config = get_pypy_config(translating=True)
+ self.config = get_combined_translation_config(translating=True)
class logger_noopt:
@classmethod
diff --git a/rpython/jit/metainterp/pyjitpl.py
b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -1407,8 +1407,8 @@
if warmrunnerdesc:
self.config = warmrunnerdesc.translator.config
else:
- from pypy.config.pypyoption import get_pypy_config
- self.config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ self.config = get_combined_translation_config(translating=True)
backendmodule = self.cpu.__module__
backendmodule = backendmodule.split('.')[-2]
diff --git a/rpython/jit/metainterp/test/test_compile.py
b/rpython/jit/metainterp/test/test_compile.py
--- a/rpython/jit/metainterp/test/test_compile.py
+++ b/rpython/jit/metainterp/test/test_compile.py
@@ -1,4 +1,4 @@
-from pypy.config.pypyoption import get_pypy_config
+from rpython.config.translationoption import get_combined_translation_config
from rpython.jit.metainterp.history import TargetToken, ConstInt, History,
Stats
from rpython.jit.metainterp.history import BoxInt, INT
from rpython.jit.metainterp.compile import compile_loop
@@ -41,7 +41,7 @@
logger_noopt = FakeLogger()
logger_ops = FakeLogger()
- config = get_pypy_config(translating=True)
+ config = get_combined_translation_config(translating=True)
stats = Stats()
profiler = jitprof.EmptyProfiler()
diff --git a/rpython/rlib/test/test_rstacklet.py
b/rpython/rlib/test/test_rstacklet.py
--- a/rpython/rlib/test/test_rstacklet.py
+++ b/rpython/rlib/test/test_rstacklet.py
@@ -226,8 +226,8 @@
class BaseTestStacklet(StandaloneTests):
def setup_class(cls):
- from pypy.config.pypyoption import get_pypy_config
- config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ config = get_combined_translation_config(translating=True)
config.translation.gc = cls.gc
if cls.gcrootfinder is not None:
config.translation.continuation = True
diff --git a/rpython/rtyper/memory/gc/test/test_direct.py
b/rpython/rtyper/memory/gc/test/test_direct.py
--- a/rpython/rtyper/memory/gc/test/test_direct.py
+++ b/rpython/rtyper/memory/gc/test/test_direct.py
@@ -64,8 +64,8 @@
GC_PARAMS = {}
def setup_method(self, meth):
- from pypy.config.pypyoption import get_pypy_config
- config = get_pypy_config(translating=True).translation
+ from rpython.config.translationoption import
get_combined_translation_config
+ config = get_combined_translation_config(translating=True).translation
self.stackroots = []
GC_PARAMS = self.GC_PARAMS.copy()
if hasattr(meth, 'GC_PARAMS'):
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
@@ -1963,8 +1963,8 @@
class TestLLtypeSmallFuncSets(TestLLtype):
def setup_class(cls):
- from pypy.config.pypyoption import get_pypy_config
- cls.config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ cls.config = get_combined_translation_config(translating=True)
cls.config.translation.withsmallfuncsets = 3
def interpret(self, fn, args, **kwds):
@@ -1973,9 +1973,9 @@
def test_smallfuncsets_basic():
from rpython.translator.translator import TranslationContext, graphof
- from pypy.config.pypyoption import get_pypy_config
+ from rpython.config.translationoption import
get_combined_translation_config
from rpython.rtyper.llinterp import LLInterpreter
- config = get_pypy_config(translating=True)
+ config = get_combined_translation_config(translating=True)
config.translation.withsmallfuncsets = 10
def g(x):
diff --git a/rpython/translator/c/gcc/test/test_asmgcroot.py
b/rpython/translator/c/gcc/test/test_asmgcroot.py
--- a/rpython/translator/c/gcc/test/test_asmgcroot.py
+++ b/rpython/translator/c/gcc/test/test_asmgcroot.py
@@ -27,8 +27,8 @@
def make_config(cls):
if _MSVC and _WIN64:
py.test.skip("all asmgcroot tests disabled for MSVC X64")
- from pypy.config.pypyoption import get_pypy_config
- config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ config = get_combined_translation_config(translating=True)
config.translation.gc = cls.gcpolicy
config.translation.gcrootfinder = "asmgcc"
config.translation.taggedpointers = getattr(cls, "taggedpointers",
False)
diff --git a/rpython/translator/c/gcc/test/test_thread.py
b/rpython/translator/c/gcc/test/test_thread.py
--- a/rpython/translator/c/gcc/test/test_thread.py
+++ b/rpython/translator/c/gcc/test/test_thread.py
@@ -13,6 +13,6 @@
def setup_class(cls):
if sys.platform == 'win32':
- from pypy.config.pypyoption import get_pypy_config
- cls.config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ cls.config = get_combined_translation_config(translating=True)
cls.config.translation.cc = 'mingw32'
diff --git a/rpython/translator/c/test/test_standalone.py
b/rpython/translator/c/test/test_standalone.py
--- a/rpython/translator/c/test/test_standalone.py
+++ b/rpython/translator/c/test/test_standalone.py
@@ -409,8 +409,8 @@
assert 'bok' in data
#
# finally, check compiling with logging disabled
- from pypy.config.pypyoption import get_pypy_config
- config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ config = get_combined_translation_config(translating=True)
config.translation.log = False
self.config = config
t, cbuilder = self.compile(entry_point)
@@ -819,8 +819,8 @@
py.test.skip("TestMaemo: tests skipped for now")
from rpython.translator.platform.maemo import check_scratchbox
check_scratchbox()
- from pypy.config.pypyoption import get_pypy_config
- config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ config = get_combined_translation_config(translating=True)
config.translation.platform = 'maemo'
cls.config = config
diff --git a/rpython/translator/driver.py b/rpython/translator/driver.py
--- a/rpython/translator/driver.py
+++ b/rpython/translator/driver.py
@@ -79,8 +79,8 @@
self.log = log
if config is None:
- from pypy.config.pypyoption import get_pypy_config
- config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ config = get_combined_translation_config(translating=True)
self.config = config
if overrides is not None:
self.config.override(overrides)
diff --git a/rpython/translator/oosupport/genoo.py
b/rpython/translator/oosupport/genoo.py
--- a/rpython/translator/oosupport/genoo.py
+++ b/rpython/translator/oosupport/genoo.py
@@ -34,8 +34,8 @@
self.entrypoint = entrypoint
self.db = self.Database(self)
if config is None:
- from pypy.config.pypyoption import get_pypy_config
- config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ config = get_combined_translation_config(translating=True)
self.config = config
# XXX: move this option out of the 'cli' section
diff --git a/rpython/translator/translator.py b/rpython/translator/translator.py
--- a/rpython/translator/translator.py
+++ b/rpython/translator/translator.py
@@ -27,8 +27,8 @@
def __init__(self, config=None, **flowing_flags):
if config is None:
- from pypy.config.pypyoption import get_pypy_config
- config = get_pypy_config(translating=True)
+ from rpython.config.translationoption import
get_combined_translation_config
+ config = get_combined_translation_config(translating=True)
# ZZZ should go away in the end
for attr in ['verbose', 'simplifying',
'list_comprehension_operations']:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
