[pypy-commit] pypy split-rpython: Moved ansi modules and udir to rpython
Aquana
noreply at buildbot.pypy.org
Fri Jan 4 22:30:56 CET 2013
Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: split-rpython
Changeset: r59699:81f81b215fcd
Date: 2013-01-01 23:02 +0100
http://bitbucket.org/pypy/pypy/changeset/81f81b215fcd/
Log: Moved ansi modules and udir to rpython
diff --git a/lib_pypy/ctypes_config_cache/rebuild.py b/lib_pypy/ctypes_config_cache/rebuild.py
--- a/lib_pypy/ctypes_config_cache/rebuild.py
+++ b/lib_pypy/ctypes_config_cache/rebuild.py
@@ -15,7 +15,7 @@
_dirpath = os.path.dirname(__file__) or os.curdir
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("ctypes_config_cache")
py.log.setconsumer("ctypes_config_cache", ansi_log)
diff --git a/lib_pypy/ctypes_config_cache/test/test_cache.py b/lib_pypy/ctypes_config_cache/test/test_cache.py
--- a/lib_pypy/ctypes_config_cache/test/test_cache.py
+++ b/lib_pypy/ctypes_config_cache/test/test_cache.py
@@ -1,6 +1,6 @@
import py
import sys, os
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
dirpath = py.path.local(__file__).dirpath().dirpath()
diff --git a/lib_pypy/pypy_test/test_dbm_extra.py b/lib_pypy/pypy_test/test_dbm_extra.py
--- a/lib_pypy/pypy_test/test_dbm_extra.py
+++ b/lib_pypy/pypy_test/test_dbm_extra.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import
import py
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
try:
from lib_pypy import dbm
except ImportError, e:
diff --git a/lib_pypy/pypy_test/test_marshal_extra.py b/lib_pypy/pypy_test/test_marshal_extra.py
--- a/lib_pypy/pypy_test/test_marshal_extra.py
+++ b/lib_pypy/pypy_test/test_marshal_extra.py
@@ -4,7 +4,7 @@
import marshal as cpy_marshal
from lib_pypy import _marshal as marshal
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
hello = "he"
hello += "llo"
diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -368,7 +368,7 @@
# ____________________________________________________________
# Utilities
-from pypy.tool.ansi_print import ansi_print
+from rpython.tool.ansi_print import ansi_print
def debug_print(text, file=None, newline=True):
# 31: ANSI color code "red"
diff --git a/pypy/interpreter/test/test_buffer.py b/pypy/interpreter/test/test_buffer.py
--- a/pypy/interpreter/test/test_buffer.py
+++ b/pypy/interpreter/test/test_buffer.py
@@ -1,6 +1,6 @@
import py
from pypy.interpreter.buffer import Buffer
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
testdir = udir.ensure('test_buffer', dir=1)
diff --git a/pypy/interpreter/test/test_compiler.py b/pypy/interpreter/test/test_compiler.py
--- a/pypy/interpreter/test/test_compiler.py
+++ b/pypy/interpreter/test/test_compiler.py
@@ -622,7 +622,7 @@
assert space.float_w(w_result) == 0
def test_dont_inherit_across_import(self):
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
udir.join('test_dont_inherit_across_import.py').write('x = 1/2\n')
space = self.space
s1 = str(py.code.Source("""
diff --git a/pypy/interpreter/test/test_exec.py b/pypy/interpreter/test/test_exec.py
--- a/pypy/interpreter/test/test_exec.py
+++ b/pypy/interpreter/test/test_exec.py
@@ -2,7 +2,7 @@
New for PyPy - Could be incorporated into CPython regression tests.
"""
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
def test_file(space):
diff --git a/pypy/interpreter/test/test_executioncontext.py b/pypy/interpreter/test/test_executioncontext.py
--- a/pypy/interpreter/test/test_executioncontext.py
+++ b/pypy/interpreter/test/test_executioncontext.py
@@ -262,7 +262,7 @@
def setup_method(self, meth):
if not self.runappdirect:
py.test.skip("test is meant for running with py.test -A")
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
tmpfile = udir.join('test_execution_context')
tmpfile.write("""
import gc
diff --git a/pypy/interpreter/test/test_extmodules.py b/pypy/interpreter/test/test_extmodules.py
--- a/pypy/interpreter/test/test_extmodules.py
+++ b/pypy/interpreter/test/test_extmodules.py
@@ -3,7 +3,7 @@
from pypy.config.pypyoption import get_pypy_config
from pypy.objspace.std import StdObjSpace
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
mod_init = """
from pypy.interpreter.mixedmodule import MixedModule
diff --git a/pypy/interpreter/test/test_main.py b/pypy/interpreter/test/test_main.py
--- a/pypy/interpreter/test/test_main.py
+++ b/pypy/interpreter/test/test_main.py
@@ -1,7 +1,7 @@
from cStringIO import StringIO
import py
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.interpreter.baseobjspace import OperationError
from pypy.interpreter import main
diff --git a/pypy/interpreter/test/test_pyframe.py b/pypy/interpreter/test/test_pyframe.py
--- a/pypy/interpreter/test/test_pyframe.py
+++ b/pypy/interpreter/test/test_pyframe.py
@@ -1,4 +1,4 @@
-from pypy.tool import udir
+from rpython.tool import udir
from pypy.conftest import option
diff --git a/pypy/interpreter/test/test_typedef.py b/pypy/interpreter/test/test_typedef.py
--- a/pypy/interpreter/test/test_typedef.py
+++ b/pypy/interpreter/test/test_typedef.py
@@ -1,6 +1,6 @@
import gc
from pypy.interpreter import typedef
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.interpreter.baseobjspace import Wrappable
from pypy.interpreter.gateway import ObjSpace, interp2app
diff --git a/pypy/interpreter/test/test_zpy.py b/pypy/interpreter/test/test_zpy.py
--- a/pypy/interpreter/test/test_zpy.py
+++ b/pypy/interpreter/test/test_zpy.py
@@ -1,5 +1,5 @@
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import py
import sys
import pypy
diff --git a/pypy/module/__builtin__/test/test_builtin.py b/pypy/module/__builtin__/test/test_builtin.py
--- a/pypy/module/__builtin__/test/test_builtin.py
+++ b/pypy/module/__builtin__/test/test_builtin.py
@@ -670,7 +670,7 @@
class TestInternal:
def test_execfile(self, space):
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
fn = str(udir.join('test_execfile'))
f = open(fn, 'w')
print >>f, "i=42"
@@ -684,7 +684,7 @@
assert space.eq_w(w_value, space.wrap(42))
def test_execfile_different_lineendings(self, space):
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
d = udir.ensure('lineending', dir=1)
dos = d.join('dos.py')
f = dos.open('wb')
diff --git a/pypy/module/_cffi_backend/test/test_c.py b/pypy/module/_cffi_backend/test/test_c.py
--- a/pypy/module/_cffi_backend/test/test_c.py
+++ b/pypy/module/_cffi_backend/test/test_c.py
@@ -19,7 +19,7 @@
if sys.version_info < (2, 6):
py.test.skip("requires the b'' literal syntax")
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.interpreter import gateway
from pypy.module._cffi_backend import Module
from rpython.translator.platform import host
diff --git a/pypy/module/_ffi/test/test_funcptr.py b/pypy/module/_ffi/test/test_funcptr.py
--- a/pypy/module/_ffi/test/test_funcptr.py
+++ b/pypy/module/_ffi/test/test_funcptr.py
@@ -11,7 +11,7 @@
@classmethod
def prepare_c_example(cls):
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.platform import platform
diff --git a/pypy/module/_file/test/test_file.py b/pypy/module/_file/test/test_file.py
--- a/pypy/module/_file/test/test_file.py
+++ b/pypy/module/_file/test/test_file.py
@@ -444,7 +444,7 @@
def test_flush_at_exit():
from pypy import conftest
from pypy.tool.option import make_config, make_objspace
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
tmpfile = udir.join('test_flush_at_exit')
config = make_config(conftest.option)
diff --git a/pypy/module/_file/test/test_file_extra.py b/pypy/module/_file/test/test_file_extra.py
--- a/pypy/module/_file/test/test_file_extra.py
+++ b/pypy/module/_file/test/test_file_extra.py
@@ -1,8 +1,8 @@
import os, random, sys
-import pypy.tool.udir
+import rpython.tool.udir
import py
-udir = pypy.tool.udir.udir.ensure('test_file_extra', dir=1)
+udir = rpython.tool.udir.udir.ensure('test_file_extra', dir=1)
# XXX this file is a random test. It may only fail occasionally
diff --git a/pypy/module/_io/test/test_bufferedio.py b/pypy/module/_io/test/test_bufferedio.py
--- a/pypy/module/_io/test/test_bufferedio.py
+++ b/pypy/module/_io/test/test_bufferedio.py
@@ -1,6 +1,6 @@
from __future__ import with_statement
from pypy.interpreter.gateway import interp2app
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.module._io import interp_bufferedio
from pypy.interpreter.error import OperationError
import py.test
diff --git a/pypy/module/_io/test/test_fileio.py b/pypy/module/_io/test/test_fileio.py
--- a/pypy/module/_io/test/test_fileio.py
+++ b/pypy/module/_io/test/test_fileio.py
@@ -1,4 +1,4 @@
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import os
class AppTestFileIO:
@@ -163,7 +163,7 @@
def test_flush_at_exit():
from pypy import conftest
from pypy.tool.option import make_config, make_objspace
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
tmpfile = udir.join('test_flush_at_exit')
config = make_config(conftest.option)
diff --git a/pypy/module/_io/test/test_io.py b/pypy/module/_io/test/test_io.py
--- a/pypy/module/_io/test/test_io.py
+++ b/pypy/module/_io/test/test_io.py
@@ -1,6 +1,6 @@
from __future__ import with_statement
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
class AppTestIoModule:
diff --git a/pypy/module/_minimal_curses/test/test_curses.py b/pypy/module/_minimal_curses/test/test_curses.py
--- a/pypy/module/_minimal_curses/test/test_curses.py
+++ b/pypy/module/_minimal_curses/test/test_curses.py
@@ -1,5 +1,5 @@
from pypy.tool.autopath import pypydir
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import py
import sys
# tests here are run as snippets through a pexpected python subprocess
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
@@ -9,7 +9,7 @@
spaceconfig = dict(usemodules=['_rawffi', 'struct'])
def prepare_c_example():
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
c_file = udir.ensure("test__rawffi", dir=1).join("xlib.c")
c_file.write(py.code.Source('''
#include <stdlib.h>
diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py
--- a/pypy/module/_socket/test/test_sock_app.py
+++ b/pypy/module/_socket/test/test_sock_app.py
@@ -1,7 +1,7 @@
import sys
import py
from pypy.tool.pytest.objspace import gettestobjspace
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rlib import rsocket
from rpython.rtyper.lltypesystem import lltype, rffi
diff --git a/pypy/module/_winreg/test/test_winreg.py b/pypy/module/_winreg/test/test_winreg.py
--- a/pypy/module/_winreg/test/test_winreg.py
+++ b/pypy/module/_winreg/test/test_winreg.py
@@ -1,4 +1,4 @@
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import os, sys, py
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@ -12,7 +12,7 @@
from rpython.rlib.objectmodel import we_are_translated
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.gensupp import NameManager
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator import platform
from pypy.module.cpyext.state import State
from pypy.interpreter.error import OperationError, operationerrfmt
diff --git a/pypy/module/cpyext/presetup.py b/pypy/module/cpyext/presetup.py
--- a/pypy/module/cpyext/presetup.py
+++ b/pypy/module/cpyext/presetup.py
@@ -11,7 +11,7 @@
dn = os.path.dirname
rootdir = dn(dn(dn(dn(__file__))))
sys.path.insert(0, rootdir)
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
pypydir = os.path.join(rootdir, 'pypy')
f = open(os.path.join(str(udir), 'pyconfig.h'), "w")
f.write("\n")
diff --git a/pypy/module/cpyext/test/test_cpyext.py b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -10,7 +10,7 @@
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator import platform
from rpython.translator.gensupp import uniquemodulename
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.module.cpyext import api
from pypy.module.cpyext.state import State
from pypy.module.cpyext.pyobject import RefcountState
diff --git a/pypy/module/cpyext/test/test_eval.py b/pypy/module/cpyext/test/test_eval.py
--- a/pypy/module/cpyext/test/test_eval.py
+++ b/pypy/module/cpyext/test/test_eval.py
@@ -6,7 +6,7 @@
from pypy.module.cpyext.api import fopen, fclose, fileno, Py_ssize_tP
from pypy.interpreter.gateway import interp2app
from pypy.interpreter.astcompiler import consts
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import sys, os
class TestEval(BaseApiTest):
diff --git a/pypy/module/cpyext/test/test_pyfile.py b/pypy/module/cpyext/test/test_pyfile.py
--- a/pypy/module/cpyext/test/test_pyfile.py
+++ b/pypy/module/cpyext/test/test_pyfile.py
@@ -2,7 +2,7 @@
from pypy.module.cpyext.test.test_api import BaseApiTest
from pypy.module.cpyext.object import Py_PRINT_RAW
from rpython.rtyper.lltypesystem import rffi, lltype
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import pytest
class TestFile(BaseApiTest):
diff --git a/pypy/module/fcntl/test/test_fcntl.py b/pypy/module/fcntl/test/test_fcntl.py
--- a/pypy/module/fcntl/test/test_fcntl.py
+++ b/pypy/module/fcntl/test/test_fcntl.py
@@ -1,5 +1,5 @@
import os
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
if os.name == "nt":
from py.test import skip
diff --git a/pypy/module/gc/test/test_app_referents.py b/pypy/module/gc/test/test_app_referents.py
--- a/pypy/module/gc/test/test_app_referents.py
+++ b/pypy/module/gc/test/test_app_referents.py
@@ -1,5 +1,5 @@
import py, os
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
def test_interface_to_dump_rpy_heap_str(space):
diff --git a/pypy/module/gc/test/test_gc.py b/pypy/module/gc/test/test_gc.py
--- a/pypy/module/gc/test/test_gc.py
+++ b/pypy/module/gc/test/test_gc.py
@@ -73,7 +73,7 @@
def setup_class(cls):
import py
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
from rpython.rlib import rgc
class X(object):
def __init__(self, count, size, links):
diff --git a/pypy/module/imp/test/test_import.py b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -3,7 +3,7 @@
from pypy.interpreter import gateway
from pypy.interpreter.error import OperationError
import pypy.interpreter.pycode
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rlib import streamio
from pypy.tool.option import make_config
from pypy.tool.pytest.objspace import maketestobjspace
diff --git a/pypy/module/marshal/test/test_marshal.py b/pypy/module/marshal/test/test_marshal.py
--- a/pypy/module/marshal/test/test_marshal.py
+++ b/pypy/module/marshal/test/test_marshal.py
@@ -1,4 +1,4 @@
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
class AppTestMarshal:
diff --git a/pypy/module/mmap/test/test_mmap.py b/pypy/module/mmap/test/test_mmap.py
--- a/pypy/module/mmap/test/test_mmap.py
+++ b/pypy/module/mmap/test/test_mmap.py
@@ -1,5 +1,5 @@
from __future__ import with_statement
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import os
class AppTestMMap:
diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -3,7 +3,7 @@
from __future__ import with_statement
from pypy.objspace.std import StdObjSpace
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.tool.pytest.objspace import gettestobjspace
from pypy.tool.autopath import pypydir
from rpython.rtyper.module.ll_os import RegisterOs
diff --git a/pypy/module/posix/test/test_posix_libfile.py b/pypy/module/posix/test/test_posix_libfile.py
--- a/pypy/module/posix/test/test_posix_libfile.py
+++ b/pypy/module/posix/test/test_posix_libfile.py
@@ -1,6 +1,6 @@
import os
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
def setup_module(mod):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_00_model.py b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
@@ -4,7 +4,7 @@
import subprocess
import py
from lib_pypy import disassembler
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.tool import logparser
from rpython.jit.tool.jitoutput import parse_prof
from pypy.module.pypyjit.test_pypy_c.model import (Log, find_ids_range,
diff --git a/pypy/module/sys/state.py b/pypy/module/sys/state.py
--- a/pypy/module/sys/state.py
+++ b/pypy/module/sys/state.py
@@ -57,6 +57,6 @@
def pypy_getudir(space):
"""NOT_RPYTHON
(should be removed from interpleveldefs before translation)"""
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
return space.wrap(str(udir))
diff --git a/pypy/module/termios/test/test_termios.py b/pypy/module/termios/test/test_termios.py
--- a/pypy/module/termios/test/test_termios.py
+++ b/pypy/module/termios/test/test_termios.py
@@ -2,7 +2,7 @@
import py
import sys
from pypy.tool.autopath import pypydir
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
class TestTermios(object):
def setup_class(cls):
diff --git a/pypy/module/test_lib_pypy/test_msvcrt.py b/pypy/module/test_lib_pypy/test_msvcrt.py
--- a/pypy/module/test_lib_pypy/test_msvcrt.py
+++ b/pypy/module/test_lib_pypy/test_msvcrt.py
@@ -1,4 +1,4 @@
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import py
import sys
diff --git a/pypy/module/thread/test/test_import_lock.py b/pypy/module/thread/test/test_import_lock.py
--- a/pypy/module/thread/test/test_import_lock.py
+++ b/pypy/module/thread/test/test_import_lock.py
@@ -1,4 +1,4 @@
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.module.thread.test.support import GenericTestThread
diff --git a/pypy/module/zipimport/test/test_zipimport.py b/pypy/module/zipimport/test/test_zipimport.py
--- a/pypy/module/zipimport/test/test_zipimport.py
+++ b/pypy/module/zipimport/test/test_zipimport.py
@@ -6,7 +6,7 @@
from pypy.module.imp.importing import get_pyc_magic, _w_long
from StringIO import StringIO
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from zipfile import ZIP_STORED, ZIP_DEFLATED
diff --git a/pypy/tool/error.py b/pypy/tool/error.py
--- a/pypy/tool/error.py
+++ b/pypy/tool/error.py
@@ -2,7 +2,7 @@
""" error handling features, just a way of displaying errors
"""
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
from rpython.flowspace.model import Variable
import sys
diff --git a/pypy/tool/pytest/expecttest.py b/pypy/tool/pytest/expecttest.py
--- a/pypy/tool/pytest/expecttest.py
+++ b/pypy/tool/pytest/expecttest.py
@@ -8,7 +8,7 @@
import py
import os, sys
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.tool.autopath import pypydir
diff --git a/pypy/tool/pytest/test/test_pytestsupport.py b/pypy/tool/pytest/test/test_pytestsupport.py
--- a/pypy/tool/pytest/test/test_pytestsupport.py
+++ b/pypy/tool/pytest/test/test_pytestsupport.py
@@ -5,7 +5,7 @@
from pypy.tool.pytest.appsupport import (AppFrame, build_pytest_assertion,
AppExceptionInfo, interpret)
import py
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import os
import sys
import pypy
diff --git a/pypy/tool/release/make_release.py b/pypy/tool/release/make_release.py
--- a/pypy/tool/release/make_release.py
+++ b/pypy/tool/release/make_release.py
@@ -14,7 +14,7 @@
from xml.dom import minidom
import re
import py
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.tool.release.package import package
import tarfile
import os
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -15,7 +15,7 @@
import py
import os
import fnmatch
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
if sys.version_info < (2,6): py.test.skip("requires 2.6 so far")
diff --git a/pypy/tool/test/test_gcc_cache.py b/pypy/tool/test/test_gcc_cache.py
--- a/pypy/tool/test/test_gcc_cache.py
+++ b/pypy/tool/test/test_gcc_cache.py
@@ -1,6 +1,6 @@
import sys
from pypy.tool.gcc_cache import *
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import md5, cStringIO
from rpython.translator.tool.cbuild import ExternalCompilationInfo
diff --git a/pypy/tool/test/test_logparser.py b/pypy/tool/test/test_logparser.py
--- a/pypy/tool/test/test_logparser.py
+++ b/pypy/tool/test/test_logparser.py
@@ -1,4 +1,4 @@
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.tool.logparser import *
diff --git a/pypy/tool/test/test_udir.py b/pypy/tool/test/test_udir.py
--- a/pypy/tool/test/test_udir.py
+++ b/pypy/tool/test/test_udir.py
@@ -1,5 +1,5 @@
-from pypy.tool import udir
+from rpython.tool import udir
def test_make_udir():
root = str(udir.udir.ensure('make_udir1', dir=1))
diff --git a/pypy/tool/version.py b/pypy/tool/version.py
--- a/pypy/tool/version.py
+++ b/pypy/tool/version.py
@@ -10,7 +10,7 @@
if not err:
return
- from pypy.tool.ansi_print import ansi_log
+ from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("version")
py.log.setconsumer("version", ansi_log)
log.WARNING('Errors getting %s information: %s' % (repo_type, err))
diff --git a/rpython/annotator/annrpython.py b/rpython/annotator/annrpython.py
--- a/rpython/annotator/annrpython.py
+++ b/rpython/annotator/annrpython.py
@@ -1,7 +1,7 @@
from __future__ import absolute_import
import types
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
from rpython.tool.pairtype import pair
from pypy.tool.error import (format_blocked_annotation_error,
AnnotatorError, gather_error, ErrorWrapper)
diff --git a/rpython/jit/backend/arm/codebuilder.py b/rpython/jit/backend/arm/codebuilder.py
--- a/rpython/jit/backend/arm/codebuilder.py
+++ b/rpython/jit/backend/arm/codebuilder.py
@@ -6,7 +6,7 @@
from rpython.jit.backend.llsupport.asmmemmgr import BlockBuilderMixin
from rpython.rlib.objectmodel import we_are_translated
from rpython.rtyper.lltypesystem import lltype, rffi, llmemory
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
clear_cache = rffi.llexternal(
"__clear_cache",
diff --git a/rpython/jit/backend/arm/test/gen.py b/rpython/jit/backend/arm/test/gen.py
--- a/rpython/jit/backend/arm/test/gen.py
+++ b/rpython/jit/backend/arm/test/gen.py
@@ -1,5 +1,5 @@
import os
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import tempfile
from rpython.jit.backend.arm.test.support import AS
class ASMInstruction(object):
diff --git a/rpython/jit/backend/arm/test/test_zrpy_gc.py b/rpython/jit/backend/arm/test/test_zrpy_gc.py
--- a/rpython/jit/backend/arm/test/test_zrpy_gc.py
+++ b/rpython/jit/backend/arm/test/test_zrpy_gc.py
@@ -12,7 +12,7 @@
from rpython.rlib.jit import JitDriver, dont_look_inside
from rpython.rlib.jit import elidable, unroll_safe
from rpython.jit.backend.llsupport.gc import GcLLDescr_framework
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.config.translationoption import DEFL_GC
from rpython.jit.backend.arm.test.support import skip_unless_run_slow_tests
skip_unless_run_slow_tests()
diff --git a/rpython/jit/backend/arm/test/test_ztranslation.py b/rpython/jit/backend/arm/test/test_ztranslation.py
--- a/rpython/jit/backend/arm/test/test_ztranslation.py
+++ b/rpython/jit/backend/arm/test/test_ztranslation.py
@@ -1,5 +1,5 @@
import py, os, sys
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rlib.jit import JitDriver, unroll_parameters, set_param
from rpython.rlib.jit import PARAMETERS, dont_look_inside
from rpython.rlib.jit import promote
diff --git a/rpython/jit/backend/arm/tool/viewcode.py b/rpython/jit/backend/arm/tool/viewcode.py
--- a/rpython/jit/backend/arm/tool/viewcode.py
+++ b/rpython/jit/backend/arm/tool/viewcode.py
@@ -59,7 +59,7 @@
def get_tmp_file():
- # don't use pypy.tool.udir here to avoid removing old usessions which
+ # don't use rpython.tool.udir here to avoid removing old usessions which
# might still contain interesting executables
udir = py.path.local.make_numbered_dir(prefix='viewcode-', keep=2)
tmpfile = str(udir.join('dump.tmp'))
diff --git a/rpython/jit/backend/llgraph/llimpl.py b/rpython/jit/backend/llgraph/llimpl.py
--- a/rpython/jit/backend/llgraph/llimpl.py
+++ b/rpython/jit/backend/llgraph/llimpl.py
@@ -28,7 +28,7 @@
from rpython.rlib.rtimer import read_timestamp
import py
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer('runner')
py.log.setconsumer('runner', ansi_log)
diff --git a/rpython/jit/backend/x86/runner.py b/rpython/jit/backend/x86/runner.py
--- a/rpython/jit/backend/x86/runner.py
+++ b/rpython/jit/backend/x86/runner.py
@@ -13,7 +13,7 @@
from rpython.jit.backend.x86 import regloc
import sys
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer('jitbackend')
py.log.setconsumer('jitbackend', ansi_log)
diff --git a/rpython/jit/backend/x86/test/test_runner.py b/rpython/jit/backend/x86/test/test_runner.py
--- a/rpython/jit/backend/x86/test/test_runner.py
+++ b/rpython/jit/backend/x86/test/test_runner.py
@@ -13,7 +13,7 @@
from rpython.jit.metainterp.executor import execute
from rpython.jit.backend.test.runner_test import LLtypeBackendTest
from rpython.jit.tool.oparser import parse
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import ctypes
import sys
import os
diff --git a/rpython/jit/backend/x86/test/test_rx86_32_auto_encoding.py b/rpython/jit/backend/x86/test/test_rx86_32_auto_encoding.py
--- a/rpython/jit/backend/x86/test/test_rx86_32_auto_encoding.py
+++ b/rpython/jit/backend/x86/test/test_rx86_32_auto_encoding.py
@@ -2,7 +2,7 @@
import py
from rpython.jit.backend.x86 import rx86
from rpython.rlib.rarithmetic import intmask
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
INPUTNAME = 'checkfile_%s.s'
FILENAME = 'checkfile_%s.o'
diff --git a/rpython/jit/backend/x86/test/test_zrpy_gc.py b/rpython/jit/backend/x86/test/test_zrpy_gc.py
--- a/rpython/jit/backend/x86/test/test_zrpy_gc.py
+++ b/rpython/jit/backend/x86/test/test_zrpy_gc.py
@@ -12,7 +12,7 @@
from rpython.rlib.jit import JitDriver, dont_look_inside
from rpython.rlib.jit import elidable, unroll_safe
from rpython.jit.backend.llsupport.gc import GcLLDescr_framework
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.config.translationoption import DEFL_GC
class X(object):
diff --git a/rpython/jit/backend/x86/test/test_ztranslation.py b/rpython/jit/backend/x86/test/test_ztranslation.py
--- a/rpython/jit/backend/x86/test/test_ztranslation.py
+++ b/rpython/jit/backend/x86/test/test_ztranslation.py
@@ -1,5 +1,5 @@
import py, os, sys
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rlib.jit import JitDriver, unroll_parameters, set_param
from rpython.rlib.jit import PARAMETERS, dont_look_inside
from rpython.rlib.jit import promote
diff --git a/rpython/jit/backend/x86/tool/test/test_viewcode.py b/rpython/jit/backend/x86/tool/test/test_viewcode.py
--- a/rpython/jit/backend/x86/tool/test/test_viewcode.py
+++ b/rpython/jit/backend/x86/tool/test/test_viewcode.py
@@ -4,7 +4,7 @@
import os
import py
import tempfile
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
def test_format_code_dump_with_labels():
lines = StringIO("""
diff --git a/rpython/jit/backend/x86/tool/viewcode.py b/rpython/jit/backend/x86/tool/viewcode.py
--- a/rpython/jit/backend/x86/tool/viewcode.py
+++ b/rpython/jit/backend/x86/tool/viewcode.py
@@ -17,17 +17,17 @@
import subprocess
from bisect import bisect_left
-# don't use pypy.tool.udir here to avoid removing old usessions which
+# don't use rpython.tool.udir here to avoid removing old usessions which
# might still contain interesting executables
udir = py.path.local.make_numbered_dir(prefix='viewcode-', keep=2)
tmpfile = str(udir.join('dump.tmp'))
# hack hack
import pypy.tool
-mod = new.module('pypy.tool.udir')
+mod = new.module('rpython.tool.udir')
mod.udir = udir
-sys.modules['pypy.tool.udir'] = mod
-pypy.tool.udir = mod
+sys.modules['rpython.tool.udir'] = mod
+rpython.tool.udir = mod
# ____________________________________________________________
# Some support code from Psyco. There is more over there,
diff --git a/rpython/jit/codewriter/codewriter.py b/rpython/jit/codewriter/codewriter.py
--- a/rpython/jit/codewriter/codewriter.py
+++ b/rpython/jit/codewriter/codewriter.py
@@ -8,7 +8,7 @@
from rpython.jit.codewriter.call import CallControl
from rpython.jit.codewriter.policy import log
from rpython.flowspace.model import copygraph
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
class CodeWriter(object):
diff --git a/rpython/jit/codewriter/policy.py b/rpython/jit/codewriter/policy.py
--- a/rpython/jit/codewriter/policy.py
+++ b/rpython/jit/codewriter/policy.py
@@ -1,8 +1,8 @@
from rpython.jit.metainterp import history
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import py
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer('jitcodewriter')
py.log.setconsumer('jitcodewriter', ansi_log)
diff --git a/rpython/rlib/clibffi.py b/rpython/rlib/clibffi.py
--- a/rpython/rlib/clibffi.py
+++ b/rpython/rlib/clibffi.py
@@ -20,7 +20,7 @@
import sys
import ctypes.util
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("libffi")
py.log.setconsumer("libffi", ansi_log)
diff --git a/rpython/rlib/rwin32.py b/rpython/rlib/rwin32.py
--- a/rpython/rlib/rwin32.py
+++ b/rpython/rlib/rwin32.py
@@ -3,7 +3,7 @@
"""
from rpython.rtyper.tool import rffi_platform
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.platform import CompilationError
from rpython.rtyper.lltypesystem import lltype, rffi
diff --git a/rpython/rlib/test/test_clibffi.py b/rpython/rlib/test/test_clibffi.py
--- a/rpython/rlib/test/test_clibffi.py
+++ b/rpython/rlib/test/test_clibffi.py
@@ -264,7 +264,7 @@
def test_struct_by_val(self):
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.platform import platform
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
c_file = udir.ensure("test_libffi", dir=1).join("xlib.c")
c_file.write(py.code.Source('''
@@ -315,7 +315,7 @@
def test_ret_struct_val(self):
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.platform import platform
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
c_file = udir.ensure("test_libffi", dir=1).join("xlib.c")
c_file.write(py.code.Source('''
@@ -391,7 +391,7 @@
def test_cdll_life_time(self):
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.platform import platform
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
c_file = udir.ensure("test_libffi", dir=1).join("xlib.c")
c_file.write(py.code.Source('''
diff --git a/rpython/rlib/test/test_libffi.py b/rpython/rlib/test/test_libffi.py
--- a/rpython/rlib/test/test_libffi.py
+++ b/rpython/rlib/test/test_libffi.py
@@ -202,7 +202,7 @@
@classmethod
def setup_class(cls):
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.tool.cbuild import STANDARD_DEFINES
from rpython.translator.platform import platform
diff --git a/rpython/rlib/test/test_rmmap.py b/rpython/rlib/test/test_rmmap.py
--- a/rpython/rlib/test/test_rmmap.py
+++ b/rpython/rlib/test/test_rmmap.py
@@ -1,4 +1,4 @@
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
import os, sys
from rpython.rtyper.test.test_llinterp import interpret
from rpython.rlib.rarithmetic import intmask
diff --git a/rpython/rlib/test/test_rposix.py b/rpython/rlib/test/test_rposix.py
--- a/rpython/rlib/test/test_rposix.py
+++ b/rpython/rlib/test/test_rposix.py
@@ -1,5 +1,5 @@
from rpython.rtyper.test.test_llinterp import interpret
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rlib import rposix
import os, sys
import py
diff --git a/rpython/rlib/test/test_rsocket.py b/rpython/rlib/test/test_rsocket.py
--- a/rpython/rlib/test/test_rsocket.py
+++ b/rpython/rlib/test/test_rsocket.py
@@ -406,7 +406,7 @@
def test_unix_socket_connect():
if getattr(rsocket, 'AF_UNIX', None) is None:
py.test.skip('AF_UNIX not supported.')
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
sockpath = str(udir.join('test_unix_socket_connect'))
a = UNIXAddress(sockpath)
diff --git a/rpython/rlib/test/test_rwin32.py b/rpython/rlib/test/test_rwin32.py
--- a/rpython/rlib/test/test_rwin32.py
+++ b/rpython/rlib/test/test_rwin32.py
@@ -3,7 +3,7 @@
skip('tests for win32 only')
from rpython.rlib import rwin32
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
def test_get_osfhandle():
diff --git a/rpython/rlib/test/test_rzipfile.py b/rpython/rlib/test/test_rzipfile.py
--- a/rpython/rlib/test/test_rzipfile.py
+++ b/rpython/rlib/test/test_rzipfile.py
@@ -1,7 +1,7 @@
import py
from rpython.rlib.rzipfile import RZipFile
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from zipfile import ZIP_STORED, ZIP_DEFLATED, ZipInfo, ZipFile
from rpython.rtyper.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin
import os
diff --git a/rpython/rlib/test/test_streamio.py b/rpython/rlib/test/test_streamio.py
--- a/rpython/rlib/test/test_streamio.py
+++ b/rpython/rlib/test/test_streamio.py
@@ -3,7 +3,7 @@
import os
import time
import random
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rlib import streamio
diff --git a/rpython/rtyper/llinterp.py b/rpython/rtyper/llinterp.py
--- a/rpython/rtyper/llinterp.py
+++ b/rpython/rtyper/llinterp.py
@@ -1248,7 +1248,7 @@
# start of a dump file
if not self.TRACE:
return
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
n = Tracer.Counter
Tracer.Counter += 1
filename = 'llinterp_trace_%d.html' % n
@@ -1400,5 +1400,5 @@
# by default we route all logging messages to nothingness
# e.g. tests can then switch on logging to get more help
# for failing tests
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
py.log.setconsumer('llinterp', ansi_log)
diff --git a/rpython/rtyper/lltypesystem/test/test_ll2ctypes.py b/rpython/rtyper/lltypesystem/test/test_ll2ctypes.py
--- a/rpython/rtyper/lltypesystem/test/test_ll2ctypes.py
+++ b/rpython/rtyper/lltypesystem/test/test_ll2ctypes.py
@@ -12,7 +12,7 @@
from rpython.rtyper.annlowlevel import llhelper
from rpython.rlib import rposix
from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rtyper.test.test_llinterp import interpret
from rpython.annotator.annrpython import RPythonAnnotator
from rpython.rtyper.rtyper import RPythonTyper
diff --git a/rpython/rtyper/lltypesystem/test/test_rffi.py b/rpython/rtyper/lltypesystem/test/test_rffi.py
--- a/rpython/rtyper/lltypesystem/test/test_rffi.py
+++ b/rpython/rtyper/lltypesystem/test/test_rffi.py
@@ -8,7 +8,7 @@
from rpython.rtyper.lltypesystem.lltype import Signed, Ptr, Char, malloc
from rpython.rtyper.lltypesystem.rstr import STR
from rpython.rtyper.lltypesystem import lltype
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rtyper.test.test_llinterp import interpret
from rpython.rtyper.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin
from rpython.annotator.annrpython import RPythonAnnotator
diff --git a/rpython/rtyper/memory/gc/test/test_env.py b/rpython/rtyper/memory/gc/test/test_env.py
--- a/rpython/rtyper/memory/gc/test/test_env.py
+++ b/rpython/rtyper/memory/gc/test/test_env.py
@@ -1,7 +1,7 @@
import os, py
from rpython.rtyper.memory.gc import env
from rpython.rlib.rarithmetic import r_uint
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
class FakeEnviron:
diff --git a/rpython/rtyper/memory/gc/test/test_inspector.py b/rpython/rtyper/memory/gc/test/test_inspector.py
--- a/rpython/rtyper/memory/gc/test/test_inspector.py
+++ b/rpython/rtyper/memory/gc/test/test_inspector.py
@@ -1,5 +1,5 @@
import os
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rtyper.memory.gc.test.test_direct import BaseDirectGCTest, S
from rpython.rtyper.memory.gc import inspector
from rpython.rtyper.lltypesystem import llmemory
diff --git a/rpython/rtyper/memory/gctransform/framework.py b/rpython/rtyper/memory/gctransform/framework.py
--- a/rpython/rtyper/memory/gctransform/framework.py
+++ b/rpython/rtyper/memory/gctransform/framework.py
@@ -587,7 +587,7 @@
def write_typeid_list(self):
"""write out the list of type ids together with some info"""
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
# XXX not ideal since it is not per compilation, but per run
# XXX argh argh, this only gives the member index but not the
# real typeid, which is a complete mess to obtain now...
diff --git a/rpython/rtyper/memory/gctransform/log.py b/rpython/rtyper/memory/gctransform/log.py
--- a/rpython/rtyper/memory/gctransform/log.py
+++ b/rpython/rtyper/memory/gctransform/log.py
@@ -1,4 +1,4 @@
import py
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("gctransform")
py.log.setconsumer("gctransform", ansi_log)
diff --git a/rpython/rtyper/memory/test/snippet.py b/rpython/rtyper/memory/test/snippet.py
--- a/rpython/rtyper/memory/test/snippet.py
+++ b/rpython/rtyper/memory/test/snippet.py
@@ -1,5 +1,5 @@
import os, py
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rtyper.lltypesystem import lltype
from rpython.rtyper.lltypesystem.lloperation import llop
diff --git a/rpython/rtyper/module/test/test_ll_os.py b/rpython/rtyper/module/test/test_ll_os.py
--- a/rpython/rtyper/module/test/test_ll_os.py
+++ b/rpython/rtyper/module/test/test_ll_os.py
@@ -2,7 +2,7 @@
from py.path import local
import pypy
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.c.test.test_genc import compile
from rpython.rtyper.module import ll_os #has side effect of registering functions
diff --git a/rpython/rtyper/module/test/test_ll_os_path.py b/rpython/rtyper/module/test/test_ll_os_path.py
--- a/rpython/rtyper/module/test/test_ll_os_path.py
+++ b/rpython/rtyper/module/test/test_ll_os_path.py
@@ -8,7 +8,7 @@
from rpython.rtyper.lltypesystem.module.ll_os_path import Implementation as impl
from rpython.rtyper.module.support import ll_strcpy
from rpython.rtyper.test.test_llinterp import interpret
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
def test_exists():
filename = impl.to_rstr(str(py.path.local(__file__)))
diff --git a/rpython/rtyper/module/test/test_ll_termios.py b/rpython/rtyper/module/test/test_ll_termios.py
--- a/rpython/rtyper/module/test/test_ll_termios.py
+++ b/rpython/rtyper/module/test/test_ll_termios.py
@@ -1,5 +1,5 @@
import py, re, sys
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
# tests here are run as snippets through a pexpected python subprocess
def setup_module(mod):
diff --git a/rpython/rtyper/module/test/test_posix.py b/rpython/rtyper/module/test/test_posix.py
--- a/rpython/rtyper/module/test/test_posix.py
+++ b/rpython/rtyper/module/test/test_posix.py
@@ -1,6 +1,6 @@
import py
from rpython.rtyper.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rlib.rarithmetic import is_valid_int
import os
diff --git a/rpython/rtyper/rmodel.py b/rpython/rtyper/rmodel.py
--- a/rpython/rtyper/rmodel.py
+++ b/rpython/rtyper/rmodel.py
@@ -480,7 +480,7 @@
# logging/warning
import py
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("rtyper")
py.log.setconsumer("rtyper", ansi_log)
diff --git a/rpython/rtyper/test/test_rbuiltin.py b/rpython/rtyper/test/test_rbuiltin.py
--- a/rpython/rtyper/test/test_rbuiltin.py
+++ b/rpython/rtyper/test/test_rbuiltin.py
@@ -12,7 +12,7 @@
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.rtyper.test import test_llinterp
from rpython.rtyper.test.tool import BaseRtypingTest, LLRtypeMixin, OORtypeMixin
-from pypy.tool import udir
+from rpython.tool import udir
from rpython.translator.translator import graphof
diff --git a/rpython/rtyper/tool/rffi_platform.py b/rpython/rtyper/tool/rffi_platform.py
--- a/rpython/rtyper/tool/rffi_platform.py
+++ b/rpython/rtyper/tool/rffi_platform.py
@@ -10,7 +10,7 @@
from pypy.tool.gcc_cache import build_executable_cache, try_compile_cache
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.platform import CompilationError
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.tool.autopath import pypydir
from rpython.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong, intmask
diff --git a/rpython/rtyper/tool/rfficache.py b/rpython/rtyper/tool/rfficache.py
--- a/rpython/rtyper/tool/rfficache.py
+++ b/rpython/rtyper/tool/rfficache.py
@@ -5,7 +5,7 @@
import py
import os
from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rlib import rarithmetic
from rpython.rtyper.lltypesystem import lltype
from pypy.tool.gcc_cache import build_executable_cache
diff --git a/rpython/rtyper/tool/test/test_mkrffi.py b/rpython/rtyper/tool/test/test_mkrffi.py
--- a/rpython/rtyper/tool/test/test_mkrffi.py
+++ b/rpython/rtyper/tool/test/test_mkrffi.py
@@ -56,7 +56,7 @@
class TestMkrffi(object):
def setup_class(cls):
import ctypes
- from pypy.tool.udir import udir
+ from rpython.tool.udir import udir
from rpython.translator.platform import platform
from rpython.translator.tool.cbuild import ExternalCompilationInfo
diff --git a/rpython/rtyper/tool/test/test_rffi_platform.py b/rpython/rtyper/tool/test/test_rffi_platform.py
--- a/rpython/rtyper/tool/test/test_rffi_platform.py
+++ b/rpython/rtyper/tool/test/test_rffi_platform.py
@@ -2,7 +2,7 @@
from rpython.rtyper.tool import rffi_platform
from rpython.rtyper.lltypesystem import lltype
from rpython.rtyper.lltypesystem import rffi
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.translator.platform import platform
from rpython.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong
diff --git a/rpython/rtyper/tool/test/test_rfficache.py b/rpython/rtyper/tool/test/test_rfficache.py
--- a/rpython/rtyper/tool/test/test_rfficache.py
+++ b/rpython/rtyper/tool/test/test_rfficache.py
@@ -1,7 +1,7 @@
from rpython.rtyper.tool.rfficache import *
from rpython.rtyper.lltypesystem import rffi
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
def test_sizeof_c_type():
sizeofchar = sizeof_c_type('char')
diff --git a/pypy/tool/ansi_mandelbrot.py b/rpython/tool/ansi_mandelbrot.py
rename from pypy/tool/ansi_mandelbrot.py
rename to rpython/tool/ansi_mandelbrot.py
diff --git a/pypy/tool/ansi_print.py b/rpython/tool/ansi_print.py
rename from pypy/tool/ansi_print.py
rename to rpython/tool/ansi_print.py
--- a/pypy/tool/ansi_print.py
+++ b/rpython/tool/ansi_print.py
@@ -4,7 +4,7 @@
import sys
from py.io import ansi_print
-from pypy.tool.ansi_mandelbrot import Driver
+from rpython.tool.ansi_mandelbrot import Driver
class AnsiLog:
wrote_dot = False # XXX sharing state with all instances
diff --git a/pypy/tool/ansicolor.py b/rpython/tool/ansicolor.py
rename from pypy/tool/ansicolor.py
rename to rpython/tool/ansicolor.py
diff --git a/pypy/tool/udir.py b/rpython/tool/udir.py
rename from pypy/tool/udir.py
rename to rpython/tool/udir.py
diff --git a/rpython/translator/backendopt/canraise.py b/rpython/translator/backendopt/canraise.py
--- a/rpython/translator/backendopt/canraise.py
+++ b/rpython/translator/backendopt/canraise.py
@@ -1,7 +1,7 @@
import py
from rpython.rtyper.lltypesystem.lloperation import LL_OPERATIONS
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
from rpython.translator.backendopt import graphanalyze
from rpython.translator.simplify import get_funcobj
diff --git a/rpython/translator/backendopt/support.py b/rpython/translator/backendopt/support.py
--- a/rpython/translator/backendopt/support.py
+++ b/rpython/translator/backendopt/support.py
@@ -2,7 +2,7 @@
from rpython.rtyper.lltypesystem import lltype
from rpython.rtyper.rmodel import inputconst
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
from rpython.translator.simplify import get_graph
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -6,7 +6,7 @@
from rpython.rtyper.typesystem import getfunctionptr
from pypy.tool import runsubprocess
from pypy.tool.nullpath import NullPyPathLocal
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.c import gc
from rpython.translator.c.database import LowLevelDatabase
from rpython.translator.c.extfunc import pre_include_code_lines
diff --git a/rpython/translator/c/support.py b/rpython/translator/c/support.py
--- a/rpython/translator/c/support.py
+++ b/rpython/translator/c/support.py
@@ -165,6 +165,6 @@
# logging
import py
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("c")
py.log.setconsumer("c", ansi_log)
diff --git a/rpython/translator/c/test/test_extfunc.py b/rpython/translator/c/test/test_extfunc.py
--- a/rpython/translator/c/test/test_extfunc.py
+++ b/rpython/translator/c/test/test_extfunc.py
@@ -1,7 +1,7 @@
import autopath
import py
import os, time, sys
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rlib.rarithmetic import r_longlong
from rpython.annotator import model as annmodel
from rpython.translator.c.test.test_genc import compile
diff --git a/rpython/translator/c/test/test_newgc.py b/rpython/translator/c/test/test_newgc.py
--- a/rpython/translator/c/test/test_newgc.py
+++ b/rpython/translator/c/test/test_newgc.py
@@ -12,7 +12,7 @@
from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
from rpython.rtyper.lltypesystem.lloperation import llop
from rpython.rtyper.memory.test import snippet
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.interactive import Translation
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
@@ -9,7 +9,7 @@
from rpython.translator.backendopt import all
from rpython.translator.c.genc import CStandaloneBuilder, ExternalCompilationInfo
from rpython.annotator.listdef import s_list_of_strings
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.tool.autopath import pypydir
from pypy.conftest import option
diff --git a/rpython/translator/cli/cts.py b/rpython/translator/cli/cts.py
--- a/rpython/translator/cli/cts.py
+++ b/rpython/translator/cli/cts.py
@@ -11,7 +11,7 @@
from rpython.translator.cli.option import getoption
from rpython.translator.cli import oopspec
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
import py
log = py.log.Producer("cli")
py.log.setconsumer("cli", ansi_log)
diff --git a/rpython/translator/cli/query.py b/rpython/translator/cli/query.py
--- a/rpython/translator/cli/query.py
+++ b/rpython/translator/cli/query.py
@@ -3,7 +3,7 @@
import os.path
import py
import subprocess
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rtyper.ootypesystem import ootype
from rpython.translator.cli.rte import Query
from rpython.translator.cli.sdk import SDK
diff --git a/rpython/translator/cli/rte.py b/rpython/translator/cli/rte.py
--- a/rpython/translator/cli/rte.py
+++ b/rpython/translator/cli/rte.py
@@ -9,7 +9,7 @@
import py
import subprocess
from rpython.translator.cli.sdk import SDK
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("cli")
py.log.setconsumer("cli", ansi_log)
diff --git a/rpython/translator/cli/support.py b/rpython/translator/cli/support.py
--- a/rpython/translator/cli/support.py
+++ b/rpython/translator/cli/support.py
@@ -3,7 +3,7 @@
from rpython.rtyper.ootypesystem import ootype
from rpython.translator.cli.rte import Support
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("cli")
py.log.setconsumer("cli", ansi_log)
diff --git a/rpython/translator/cli/test/runtest.py b/rpython/translator/cli/test/runtest.py
--- a/rpython/translator/cli/test/runtest.py
+++ b/rpython/translator/cli/test/runtest.py
@@ -3,7 +3,7 @@
import py
import subprocess
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.translator import TranslationContext
from rpython.rtyper.test.tool import BaseRtypingTest, OORtypeMixin
from rpython.rtyper.lltypesystem.lltype import typeOf
diff --git a/rpython/translator/driver.py b/rpython/translator/driver.py
--- a/rpython/translator/driver.py
+++ b/rpython/translator/driver.py
@@ -8,12 +8,12 @@
from rpython.translator.goal.timing import Timer
from rpython.annotator.listdef import s_list_of_strings
from rpython.annotator import policy as annpolicy
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.tool.debug_print import debug_start, debug_print, debug_stop
from rpython.rlib.entrypoint import secondary_entrypoints
import py
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("translation")
py.log.setconsumer("translation", ansi_log)
diff --git a/rpython/translator/goal/old_queries.py b/rpython/translator/goal/old_queries.py
--- a/rpython/translator/goal/old_queries.py
+++ b/rpython/translator/goal/old_queries.py
@@ -464,7 +464,7 @@
#
def worstblocks_topten(t, n=10):
- from pypy.tool.ansi_print import ansi_print
+ from rpython.tool.ansi_print import ansi_print
ann = t.annotator
h = [(count, block) for block, count in ann.reflowcounter.iteritems()]
h.sort()
diff --git a/rpython/translator/goal/test2/test_app_main.py b/rpython/translator/goal/test2/test_app_main.py
--- a/rpython/translator/goal/test2/test_app_main.py
+++ b/rpython/translator/goal/test2/test_app_main.py
@@ -5,7 +5,7 @@
import py
import sys, os, re, runpy, subprocess
import autopath
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from contextlib import contextmanager
banner = sys.version.splitlines()[0]
diff --git a/rpython/translator/goal/timing.py b/rpython/translator/goal/timing.py
--- a/rpython/translator/goal/timing.py
+++ b/rpython/translator/goal/timing.py
@@ -5,7 +5,7 @@
import time
import py
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("Timer")
py.log.setconsumer("Timer", ansi_log)
diff --git a/rpython/translator/goal/translate.py b/rpython/translator/goal/translate.py
--- a/rpython/translator/goal/translate.py
+++ b/rpython/translator/goal/translate.py
@@ -85,7 +85,7 @@
])
import optparse
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("translation")
py.log.setconsumer("translation", ansi_log)
diff --git a/rpython/translator/jvm/genjvm.py b/rpython/translator/jvm/genjvm.py
--- a/rpython/translator/jvm/genjvm.py
+++ b/rpython/translator/jvm/genjvm.py
@@ -10,7 +10,7 @@
import py
from rpython.rtyper.ootypesystem import ootype
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.backendopt.all import backend_optimizations
from rpython.translator.backendopt.checkvirtual import check_virtual_methods
from rpython.translator.oosupport.genoo import GenOO
diff --git a/rpython/translator/jvm/log.py b/rpython/translator/jvm/log.py
--- a/rpython/translator/jvm/log.py
+++ b/rpython/translator/jvm/log.py
@@ -4,7 +4,7 @@
from rpython.translator.jvm.log import log
"""
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
import py
log = py.log.Producer("jvm")
py.log.setconsumer("jvm", ansi_log)
diff --git a/rpython/translator/jvm/test/runtest.py b/rpython/translator/jvm/test/runtest.py
--- a/rpython/translator/jvm/test/runtest.py
+++ b/rpython/translator/jvm/test/runtest.py
@@ -3,7 +3,7 @@
import py
import subprocess
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.rtyper.test.tool import BaseRtypingTest, OORtypeMixin
from rpython.rtyper.lltypesystem.lltype import typeOf
from rpython.rtyper.ootypesystem import ootype
diff --git a/rpython/translator/oosupport/function.py b/rpython/translator/oosupport/function.py
--- a/rpython/translator/oosupport/function.py
+++ b/rpython/translator/oosupport/function.py
@@ -1,5 +1,5 @@
import py
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
log = py.log.Producer("oosupport")
py.log.setconsumer("oosupport", ansi_log)
diff --git a/rpython/translator/oosupport/test_template/builtin.py b/rpython/translator/oosupport/test_template/builtin.py
--- a/rpython/translator/oosupport/test_template/builtin.py
+++ b/rpython/translator/oosupport/test_template/builtin.py
@@ -2,7 +2,7 @@
import errno
import stat
from py.builtin import sorted
-from pypy.tool import udir
+from rpython.tool import udir
from rpython.rtyper.test.test_rbuiltin import BaseTestRbuiltin
from rpython.rtyper.module.test.test_ll_time import BaseTestTime as llBaseTestTime
diff --git a/rpython/translator/platform/__init__.py b/rpython/translator/platform/__init__.py
--- a/rpython/translator/platform/__init__.py
+++ b/rpython/translator/platform/__init__.py
@@ -2,9 +2,9 @@
import py, os, sys
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
from pypy.tool.runsubprocess import run_subprocess as _run_subprocess
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
log = py.log.Producer("platform")
diff --git a/rpython/translator/platform/arm.py b/rpython/translator/platform/arm.py
--- a/rpython/translator/platform/arm.py
+++ b/rpython/translator/platform/arm.py
@@ -2,7 +2,7 @@
from rpython.translator.platform.linux import Linux
from rpython.translator.platform.posix import _run_subprocess, GnuMakefile
from rpython.translator.platform import ExecutionResult, log
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from pypy.tool import autopath
from os import getenv
diff --git a/rpython/translator/platform/maemo.py b/rpython/translator/platform/maemo.py
--- a/rpython/translator/platform/maemo.py
+++ b/rpython/translator/platform/maemo.py
@@ -2,7 +2,7 @@
import py, os
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.platform import ExecutionResult, log
from rpython.translator.platform.linux import Linux
from rpython.translator.platform.posix import GnuMakefile, _run_subprocess
diff --git a/rpython/translator/platform/test/test_darwin.py b/rpython/translator/platform/test/test_darwin.py
--- a/rpython/translator/platform/test/test_darwin.py
+++ b/rpython/translator/platform/test/test_darwin.py
@@ -6,7 +6,7 @@
if sys.platform != 'darwin':
py.test.skip("Darwin only")
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.platform.darwin import Darwin_i386, Darwin_x86_64, Darwin_PowerPC
from rpython.translator.platform.test.test_platform import TestPlatform as BasicTest
from rpython.translator.tool.cbuild import ExternalCompilationInfo
diff --git a/rpython/translator/platform/test/test_maemo.py b/rpython/translator/platform/test/test_maemo.py
--- a/rpython/translator/platform/test/test_maemo.py
+++ b/rpython/translator/platform/test/test_maemo.py
@@ -3,7 +3,7 @@
"""
import py
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.platform.maemo import Maemo, check_scratchbox
from rpython.translator.platform.test.test_platform import TestPlatform as BasicTest
from rpython.translator.tool.cbuild import ExternalCompilationInfo
diff --git a/rpython/translator/platform/test/test_platform.py b/rpython/translator/platform/test/test_platform.py
--- a/rpython/translator/platform/test/test_platform.py
+++ b/rpython/translator/platform/test/test_platform.py
@@ -1,6 +1,6 @@
import py, sys, ctypes, os
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.platform import CompilationError, Platform
from rpython.translator.platform import host
from rpython.translator.tool.cbuild import ExternalCompilationInfo
diff --git a/rpython/translator/platform/test/test_posix.py b/rpython/translator/platform/test/test_posix.py
--- a/rpython/translator/platform/test/test_posix.py
+++ b/rpython/translator/platform/test/test_posix.py
@@ -1,7 +1,7 @@
from rpython.translator.platform import host, CompilationError
from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from StringIO import StringIO
import sys, os
diff --git a/rpython/translator/sandbox/rsandbox.py b/rpython/translator/sandbox/rsandbox.py
--- a/rpython/translator/sandbox/rsandbox.py
+++ b/rpython/translator/sandbox/rsandbox.py
@@ -16,7 +16,7 @@
from rpython.rlib.objectmodel import CDefinedIntSymbolic
from rpython.tool.sourcetools import func_with_new_name
from rpython.rtyper.annlowlevel import MixLevelHelperAnnotator
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
import py
log = py.log.Producer("sandbox")
py.log.setconsumer("sandbox", ansi_log)
diff --git a/rpython/translator/sandbox/sandlib.py b/rpython/translator/sandbox/sandlib.py
--- a/rpython/translator/sandbox/sandlib.py
+++ b/rpython/translator/sandbox/sandlib.py
@@ -13,7 +13,7 @@
def create_log():
"""Make and return a log for the sandbox to use, if needed."""
# These imports are local to avoid importing pypy if we don't need to.
- from pypy.tool.ansi_print import AnsiLog
+ from rpython.tool.ansi_print import AnsiLog
class MyAnsiLog(AnsiLog):
KW_TO_COLOR = {
diff --git a/rpython/translator/sandbox/test/test_vfs.py b/rpython/translator/sandbox/test/test_vfs.py
--- a/rpython/translator/sandbox/test/test_vfs.py
+++ b/rpython/translator/sandbox/test/test_vfs.py
@@ -1,7 +1,7 @@
import py
import sys, stat, os
from rpython.translator.sandbox.vfs import *
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
HASLINK = hasattr(os, 'symlink')
diff --git a/rpython/translator/test/test_unsimplify.py b/rpython/translator/test/test_unsimplify.py
--- a/rpython/translator/test/test_unsimplify.py
+++ b/rpython/translator/test/test_unsimplify.py
@@ -5,7 +5,7 @@
from rpython.rtyper.llinterp import LLInterpreter
from rpython.flowspace.model import checkgraph
from rpython.rlib.objectmodel import we_are_translated
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
def translate(func, argtypes, type_system="lltype"):
t = TranslationContext()
diff --git a/rpython/translator/tool/benchmark.py b/rpython/translator/tool/benchmark.py
--- a/rpython/translator/tool/benchmark.py
+++ b/rpython/translator/tool/benchmark.py
@@ -1,6 +1,6 @@
import autopath
from pypy.tool import testit
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.tool.cbuild import build_cfunc
from rpython.translator.test.test_cltrans import global_cl, make_cl_func
diff --git a/rpython/translator/tool/cbuild.py b/rpython/translator/tool/cbuild.py
--- a/rpython/translator/tool/cbuild.py
+++ b/rpython/translator/tool/cbuild.py
@@ -3,7 +3,7 @@
from pypy.tool.autopath import pypydir
from rpython.translator.platform import host
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
class ExternalCompilationInfo(object):
diff --git a/rpython/translator/tool/graphpage.py b/rpython/translator/tool/graphpage.py
--- a/rpython/translator/tool/graphpage.py
+++ b/rpython/translator/tool/graphpage.py
@@ -6,7 +6,7 @@
from rpython.annotator.description import MethodDesc
from rpython.annotator.classdef import ClassDef
from pypy.tool.uid import uid
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from dotviewer.graphpage import GraphPage as BaseGraphPage
diff --git a/rpython/translator/tool/make_dot.py b/rpython/translator/tool/make_dot.py
--- a/rpython/translator/tool/make_dot.py
+++ b/rpython/translator/tool/make_dot.py
@@ -2,7 +2,7 @@
import inspect, linecache
from rpython.flowspace.model import *
from rpython.flowspace.objspace import FlowObjSpace as Space
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from py.process import cmdexec
from pypy.interpreter.pytraceback import offset2lineno
diff --git a/rpython/translator/tool/staticsizereport.py b/rpython/translator/tool/staticsizereport.py
--- a/rpython/translator/tool/staticsizereport.py
+++ b/rpython/translator/tool/staticsizereport.py
@@ -1,7 +1,7 @@
from __future__ import division
import cPickle as pickle
-from pypy.tool.ansicolor import red, yellow, green
+from rpython.tool.ansicolor import red, yellow, green
from rpython.rtyper.lltypesystem.lltype import typeOf, _ptr, Ptr, ContainerType
from rpython.rtyper.lltypesystem import llmemory
from rpython.rtyper.memory.lltypelayout import convert_offset_to_int
diff --git a/rpython/translator/tool/test/test_cbuild.py b/rpython/translator/tool/test/test_cbuild.py
--- a/rpython/translator/tool/test/test_cbuild.py
+++ b/rpython/translator/tool/test/test_cbuild.py
@@ -1,6 +1,6 @@
import py
-from pypy.tool.udir import udir
+from rpython.tool.udir import udir
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from subprocess import Popen, PIPE, STDOUT
diff --git a/rpython/translator/translator.py b/rpython/translator/translator.py
--- a/rpython/translator/translator.py
+++ b/rpython/translator/translator.py
@@ -9,7 +9,7 @@
from rpython.translator import simplify
from rpython.flowspace.model import FunctionGraph, checkgraph, Block
from rpython.flowspace.objspace import FlowObjSpace
-from pypy.tool.ansi_print import ansi_log
+from rpython.tool.ansi_print import ansi_log
from rpython.tool.sourcetools import nice_repr_for_func
from pypy.config.pypyoption import pypy_optiondescription
from pypy.config.translationoption import get_combined_translation_config
More information about the pypy-commit
mailing list