[pypy-commit] pypy remove-translator-platform: some more import mess
fijal
noreply at buildbot.pypy.org
Tue May 22 14:04:14 CEST 2012
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: remove-translator-platform
Changeset: r55153:1f52e671b75d
Date: 2012-05-22 14:03 +0200
http://bitbucket.org/pypy/pypy/changeset/1f52e671b75d/
Log: some more import mess
diff --git a/pypy/bin/py.py b/pypy/bin/py.py
--- a/pypy/bin/py.py
+++ b/pypy/bin/py.py
@@ -57,7 +57,7 @@
def set_compiler(option, opt, value, parser):
- from pypy.translator.platform import set_platform
+ from platformer import set_platform
set_platform('host', value)
def main_(argv=None):
diff --git a/pypy/config/translationoption.py b/pypy/config/translationoption.py
--- a/pypy/config/translationoption.py
+++ b/pypy/config/translationoption.py
@@ -404,11 +404,11 @@
# ----------------------------------------------------------------
def set_platform(config):
- from pypy.translator.platform import set_platform
+ from platformer import set_platform
set_platform(config.translation.platform, config.translation.cc)
def get_platform(config):
- from pypy.translator.platform import pick_platform
+ from platformer import pick_platform
opt = config.translation.platform
cc = config.translation.cc
return pick_platform(opt, cc)
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -28,7 +28,7 @@
def _set_platform(opt, opt_str, value, parser):
from pypy.config.translationoption import PLATFORMS
- from pypy.translator.platform import set_platform
+ from platformer import set_platform
if value not in PLATFORMS:
raise ValueError("%s not in %s" % (value, PLATFORMS))
set_platform(value, None)
diff --git a/pypy/module/_ffi/test/test__ffi.py b/pypy/module/_ffi/test/test__ffi.py
--- a/pypy/module/_ffi/test/test__ffi.py
+++ b/pypy/module/_ffi/test/test__ffi.py
@@ -1,6 +1,6 @@
from pypy.conftest import gettestobjspace
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import platform
+from platformer import platform
import sys, py
diff --git a/pypy/module/_rawffi/test/test__rawffi.py b/pypy/module/_rawffi/test/test__rawffi.py
--- a/pypy/module/_rawffi/test/test__rawffi.py
+++ b/pypy/module/_rawffi/test/test__rawffi.py
@@ -1,7 +1,7 @@
from pypy.conftest import gettestobjspace
-from pypy.translator.platform import platform
+from platformer import platform
from platformer.cbuild import ExternalCompilationInfo
from pypy.module._rawffi.interp_rawffi import TYPEMAP
from pypy.module._rawffi.tracker import Tracker
diff --git a/pypy/module/bz2/interp_bz2.py b/pypy/module/bz2/interp_bz2.py
--- a/pypy/module/bz2/interp_bz2.py
+++ b/pypy/module/bz2/interp_bz2.py
@@ -8,7 +8,7 @@
from pypy.interpreter.gateway import interp2app, unwrap_spec
from pypy.rlib.streamio import Stream
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import platform as compiler
+from platformer import platform as compiler
from pypy.rlib.rarithmetic import intmask, r_longlong
import sys
diff --git a/pypy/module/pyexpat/interp_pyexpat.py b/pypy/module/pyexpat/interp_pyexpat.py
--- a/pypy/module/pyexpat/interp_pyexpat.py
+++ b/pypy/module/pyexpat/interp_pyexpat.py
@@ -7,7 +7,7 @@
from pypy.rpython.lltypesystem import rffi, lltype
from pypy.rpython.tool import rffi_platform
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import platform
+from platformer import platform
import sys
import weakref
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/conftest.py b/pypy/module/test_lib_pypy/ctypes_tests/conftest.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/conftest.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/conftest.py
@@ -6,7 +6,7 @@
return True
def compile_so_file():
- from pypy.translator.platform import platform
+ from platformer import platform
from platformer.cbuild import ExternalCompilationInfo
udir = pytest.ensuretemp('_ctypes_test')
cfile = py.path.local(__file__).dirpath().join("_ctypes_test.c")
diff --git a/pypy/rlib/_rsocket_rffi.py b/pypy/rlib/_rsocket_rffi.py
--- a/pypy/rlib/_rsocket_rffi.py
+++ b/pypy/rlib/_rsocket_rffi.py
@@ -5,7 +5,7 @@
from pypy.rpython.lltypesystem.rffi import CCHARP
from pypy.rlib.rposix import get_errno as geterrno
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import platform as target_platform
+from platformer import platform as target_platform
from pypy.rlib.rarithmetic import intmask, r_uint
import os,sys
diff --git a/pypy/rlib/clibffi.py b/pypy/rlib/clibffi.py
--- a/pypy/rlib/clibffi.py
+++ b/pypy/rlib/clibffi.py
@@ -13,7 +13,7 @@
from pypy.rlib import jit
from pypy.tool.autopath import pypydir
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import platform
+from platformer import platform
import py
import os
import sys
diff --git a/pypy/rlib/rdynload.py b/pypy/rlib/rdynload.py
--- a/pypy/rlib/rdynload.py
+++ b/pypy/rlib/rdynload.py
@@ -5,7 +5,7 @@
from pypy.rpython.lltypesystem import rffi
from pypy.rlib.rarithmetic import r_uint
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import platform
+from platformer import platform
import sys
diff --git a/pypy/rlib/ropenssl.py b/pypy/rlib/ropenssl.py
--- a/pypy/rlib/ropenssl.py
+++ b/pypy/rlib/ropenssl.py
@@ -1,6 +1,6 @@
from pypy.rpython.lltypesystem import rffi, lltype
from pypy.rpython.tool import rffi_platform
-from pypy.translator.platform import platform
+from platformer import platform
from platformer.cbuild import ExternalCompilationInfo
import sys, os
diff --git a/pypy/rlib/rsdl/eci.py b/pypy/rlib/rsdl/eci.py
--- a/pypy/rlib/rsdl/eci.py
+++ b/pypy/rlib/rsdl/eci.py
@@ -1,5 +1,5 @@
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import CompilationError
+from platformer import CompilationError
import py
import sys
diff --git a/pypy/rlib/rwin32.py b/pypy/rlib/rwin32.py
--- a/pypy/rlib/rwin32.py
+++ b/pypy/rlib/rwin32.py
@@ -5,7 +5,7 @@
from pypy.rpython.tool import rffi_platform
from pypy.tool.udir import udir
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import CompilationError
+from platformer import CompilationError
from pypy.rpython.lltypesystem import lltype, rffi
from pypy.rlib.rarithmetic import intmask
from pypy.rlib.rposix import validate_fd
@@ -142,7 +142,7 @@
# Prior to Visual Studio 8, the MSVCRT dll doesn't export the
# _dosmaperr() function, which is available only when compiled
# against the static CRT library.
- from pypy.translator.platform import host_factory
+ from platformer import host_factory
static_platform = host_factory()
if static_platform.name == 'msvc':
static_platform.cflags = ['/MT'] # static CRT
diff --git a/pypy/rlib/rzlib.py b/pypy/rlib/rzlib.py
--- a/pypy/rlib/rzlib.py
+++ b/pypy/rlib/rzlib.py
@@ -5,7 +5,7 @@
from pypy.rlib.rstring import StringBuilder
from pypy.rpython.lltypesystem import rffi, lltype
from pypy.rpython.tool import rffi_platform
-from pypy.translator.platform import platform as compiler, CompilationError
+from platformer import platform as compiler, CompilationError
from platformer.cbuild import ExternalCompilationInfo
diff --git a/pypy/rlib/test/test_clibffi.py b/pypy/rlib/test/test_clibffi.py
--- a/pypy/rlib/test/test_clibffi.py
+++ b/pypy/rlib/test/test_clibffi.py
@@ -263,7 +263,7 @@
lltype.free(tpe2, flavor='raw')
def test_struct_by_val(self):
- from pypy.translator.platform import platform
+ from platformer import platform
from pypy.tool.udir import udir
c_file = udir.ensure("test_libffi", dir=1).join("xlib.c")
@@ -313,7 +313,7 @@
assert not ALLOCATED
def test_ret_struct_val(self):
- from pypy.translator.platform import platform
+ from platformer import platform
from pypy.tool.udir import udir
c_file = udir.ensure("test_libffi", dir=1).join("xlib.c")
@@ -388,7 +388,7 @@
assert not ALLOCATED
def test_cdll_life_time(self):
- from pypy.translator.platform import platform
+ from platformer import platform
from pypy.tool.udir import udir
c_file = udir.ensure("test_libffi", dir=1).join("xlib.c")
diff --git a/pypy/rlib/test/test_libffi.py b/pypy/rlib/test/test_libffi.py
--- a/pypy/rlib/test/test_libffi.py
+++ b/pypy/rlib/test/test_libffi.py
@@ -101,7 +101,7 @@
from pypy.tool.udir import udir
from platformer.cbuild import ExternalCompilationInfo
from platformer.cbuild import STANDARD_DEFINES
- from pypy.translator.platform import platform
+ from platformer import platform
BaseFfiTest.setup_class()
# prepare C code as an example, so we can load it and call
diff --git a/pypy/rpython/lltypesystem/module/ll_math.py b/pypy/rpython/lltypesystem/module/ll_math.py
--- a/pypy/rpython/lltypesystem/module/ll_math.py
+++ b/pypy/rpython/lltypesystem/module/ll_math.py
@@ -8,7 +8,7 @@
from pypy.tool.autopath import pypydir
from pypy.rlib import jit, rposix
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import platform
+from platformer import platform
from pypy.rlib.rfloat import isfinite, isinf, isnan, INFINITY, NAN
use_library_isinf_isnan = False
diff --git a/pypy/rpython/lltypesystem/test/test_ll2ctypes.py b/pypy/rpython/lltypesystem/test/test_ll2ctypes.py
--- a/pypy/rpython/lltypesystem/test/test_ll2ctypes.py
+++ b/pypy/rpython/lltypesystem/test/test_ll2ctypes.py
@@ -1386,7 +1386,7 @@
class TestPlatform(object):
def test_lib_on_libpaths(self):
- from pypy.translator.platform import platform
+ from platformer import platform
tmpdir = udir.join('lib_on_libppaths')
tmpdir.ensure(dir=1)
@@ -1407,7 +1407,7 @@
if not sys.platform.startswith('linux'):
py.test.skip("Not supported")
- from pypy.translator.platform import platform
+ from platformer import platform
tmpdir = udir.join('lib_on_libppaths_prefix')
tmpdir.ensure(dir=1)
diff --git a/pypy/rpython/tool/rffi_platform.py b/pypy/rpython/tool/rffi_platform.py
--- a/pypy/rpython/tool/rffi_platform.py
+++ b/pypy/rpython/tool/rffi_platform.py
@@ -8,7 +8,7 @@
from pypy.rpython.lltypesystem import rffi
from pypy.tool.gcc_cache import build_executable_cache, try_compile_cache
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import CompilationError
+from platformer import CompilationError
from pypy.tool.udir import udir
from pypy.tool.autopath import pypydir
from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong, intmask
@@ -687,7 +687,7 @@
"""
def run_example_code(filepath, eci, ignore_errors=False):
- eci = eci.convert_sources_to_files(being_main=True)
+ eci = eci.convert_sources_to_files(main_clause='#define PYPY_NOT_MAIN_FILE')
files = [filepath]
output = build_executable_cache(files, eci, ignore_errors=ignore_errors)
section = None
@@ -791,7 +791,7 @@
def configure_boehm(platform=None):
if platform is None:
- from pypy.translator.platform import platform
+ from platformer import platform
if sys.platform == 'win32':
import platform as host_platform # just to ask for the arch. Confusion-alert!
if host_platform.architecture()[0] == '32bit':
diff --git a/pypy/rpython/tool/test/test_mkrffi.py b/pypy/rpython/tool/test/test_mkrffi.py
--- a/pypy/rpython/tool/test/test_mkrffi.py
+++ b/pypy/rpython/tool/test/test_mkrffi.py
@@ -57,7 +57,7 @@
def setup_class(cls):
import ctypes
from pypy.tool.udir import udir
- from pypy.translator.platform import platform
+ from platformer import platform
from platformer.cbuild import ExternalCompilationInfo
c_source = """
diff --git a/pypy/rpython/tool/test/test_rffi_platform.py b/pypy/rpython/tool/test/test_rffi_platform.py
--- a/pypy/rpython/tool/test/test_rffi_platform.py
+++ b/pypy/rpython/tool/test/test_rffi_platform.py
@@ -4,7 +4,7 @@
from pypy.rpython.lltypesystem import rffi
from pypy.tool.udir import udir
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import platform
+from platformer import platform
from pypy.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong
from pypy.rlib.rfloat import isnan
diff --git a/pypy/tool/gcc_cache.py b/pypy/tool/gcc_cache.py
--- a/pypy/tool/gcc_cache.py
+++ b/pypy/tool/gcc_cache.py
@@ -1,5 +1,5 @@
from pypy.tool.autopath import pypydir
-from pypy.translator.platform import CompilationError
+from platformer import CompilationError
from pypy.tool.compat import md5
import py
@@ -8,7 +8,7 @@
def cache_file_path(c_files, eci, cachename):
"Builds a filename to cache compilation data"
# Import 'platform' every time, the compiler may have been changed
- from pypy.translator.platform import platform
+ from platformer import platform
cache_dir = cache_dir_root.join(cachename).ensure(dir=1)
filecontents = [c_file.read() for c_file in c_files]
key = repr((filecontents, eci, platform.key()))
@@ -18,7 +18,7 @@
def build_executable_cache(c_files, eci, ignore_errors=False):
"Builds and run a program; caches the result"
# Import 'platform' every time, the compiler may have been changed
- from pypy.translator.platform import platform
+ from platformer import platform
path = cache_file_path(c_files, eci, 'build_executable_cache')
try:
return path.read()
@@ -41,7 +41,7 @@
def try_compile_cache(c_files, eci):
"Try to compile a program; caches the result (starts with 'True' or 'FAIL')"
# Import 'platform' every time, the compiler may have been changed
- from pypy.translator.platform import platform
+ from platformer import platform
path = cache_file_path(c_files, eci, 'try_compile_cache')
try:
data = path.read()
diff --git a/pypy/translator/c/gcc/test/test_asmgcroot.py b/pypy/translator/c/gcc/test/test_asmgcroot.py
--- a/pypy/translator/c/gcc/test/test_asmgcroot.py
+++ b/pypy/translator/c/gcc/test/test_asmgcroot.py
@@ -6,7 +6,7 @@
from pypy.annotation.listdef import s_list_of_strings
from pypy import conftest
from platformer.cbuild import ExternalCompilationInfo
-from pypy.translator.platform import platform as compiler
+from platformer import platform as compiler
from pypy.rlib.rarithmetic import is_emulated_long
from pypy.rpython.lltypesystem import lltype, rffi
from pypy.rlib.entrypoint import entrypoint, secondary_entrypoints
diff --git a/pypy/translator/c/test/test_boehm.py b/pypy/translator/c/test/test_boehm.py
--- a/pypy/translator/c/test/test_boehm.py
+++ b/pypy/translator/c/test/test_boehm.py
@@ -9,7 +9,7 @@
def setup_module(mod):
from pypy.rpython.tool.rffi_platform import configure_boehm
- from pypy.translator.platform import CompilationError
+ from platformer import CompilationError
try:
configure_boehm()
except CompilationError:
diff --git a/pypy/translator/c/test/test_lltyped.py b/pypy/translator/c/test/test_lltyped.py
--- a/pypy/translator/c/test/test_lltyped.py
+++ b/pypy/translator/c/test/test_lltyped.py
@@ -762,7 +762,7 @@
import sys
from pypy.rpython.lltypesystem import llgroup
from pypy.rpython.lltypesystem.lloperation import llop
- from pypy.translator.platform import CompilationError
+ from platformer import CompilationError
if toobig and sys.maxint > 2147483647:
py.test.skip("not easy to test groups too big on 64-bit platforms")
grp = llgroup.group("big")
diff --git a/pypy/translator/c/test/test_standalone.py b/pypy/translator/c/test/test_standalone.py
--- a/pypy/translator/c/test/test_standalone.py
+++ b/pypy/translator/c/test/test_standalone.py
@@ -807,7 +807,7 @@
class TestMaemo(TestStandalone):
def setup_class(cls):
py.test.skip("TestMaemo: tests skipped for now")
- from pypy.translator.platform.maemo import check_scratchbox
+ from platformer.maemo import check_scratchbox
check_scratchbox()
from pypy.config.pypyoption import get_pypy_config
config = get_pypy_config(translating=True)
diff --git a/pypy/translator/driver.py b/pypy/translator/driver.py
--- a/pypy/translator/driver.py
+++ b/pypy/translator/driver.py
@@ -472,7 +472,7 @@
def possibly_check_for_boehm(self):
if self.config.translation.gc == "boehm":
from pypy.rpython.tool.rffi_platform import configure_boehm
- from pypy.translator.platform import CompilationError
+ from platformer import CompilationError
try:
configure_boehm(self.translator.platform)
except CompilationError, e:
diff --git a/pypy/translator/tool/test/test_cbuild.py b/pypy/translator/tool/test/test_cbuild.py
--- a/pypy/translator/tool/test/test_cbuild.py
+++ b/pypy/translator/tool/test/test_cbuild.py
@@ -122,7 +122,7 @@
'dxowqbncpqympqhe-config')
def test_platforms(self):
- from pypy.translator.platform import Platform
+ from platformer import Platform
class Maemo(Platform):
def __init__(self, cc=None):
More information about the pypy-commit
mailing list