Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r59801:7cae0958a8bb
Date: 2013-01-06 05:54 +0100
http://bitbucket.org/pypy/pypy/changeset/7cae0958a8bb/
Log: Moved frozenlist, killsubprocess, nullpath and runsubprocess to
rpython
diff --git a/pypy/tool/test/test_frozenlist.py
b/pypy/tool/test/test_frozenlist.py
--- a/pypy/tool/test/test_frozenlist.py
+++ b/pypy/tool/test/test_frozenlist.py
@@ -1,5 +1,5 @@
import py
-from pypy.tool.frozenlist import frozenlist
+from rpython.tool.frozenlist import frozenlist
def test_frozenlist():
l = frozenlist([1, 2, 3])
diff --git a/pypy/tool/test/test_killsubprocess.py
b/pypy/tool/test/test_killsubprocess.py
--- a/pypy/tool/test/test_killsubprocess.py
+++ b/pypy/tool/test/test_killsubprocess.py
@@ -1,6 +1,6 @@
import sys, time
import subprocess
-from pypy.tool.killsubprocess import killsubprocess
+from rpython.tool.killsubprocess import killsubprocess
def waitdead(process):
for i in range(50):
diff --git a/pypy/tool/test/test_nullpath.py b/pypy/tool/test/test_nullpath.py
--- a/pypy/tool/test/test_nullpath.py
+++ b/pypy/tool/test/test_nullpath.py
@@ -1,6 +1,6 @@
import sys, os
import py
-from pypy.tool.nullpath import NullPyPathLocal
+from rpython.tool.nullpath import NullPyPathLocal
def test_nullpath(tmpdir):
path = NullPyPathLocal(tmpdir)
diff --git a/rpython/jit/metainterp/resoperation.py
b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -666,7 +666,7 @@
When we_are_translated(), do nothing and just return the old list.
"""
- from pypy.tool.frozenlist import frozenlist
+ from rpython.tool.frozenlist import frozenlist
if we_are_translated():
return operations
#
diff --git a/pypy/tool/frozenlist.py b/rpython/tool/frozenlist.py
rename from pypy/tool/frozenlist.py
rename to rpython/tool/frozenlist.py
diff --git a/pypy/tool/killsubprocess.py b/rpython/tool/killsubprocess.py
rename from pypy/tool/killsubprocess.py
rename to rpython/tool/killsubprocess.py
diff --git a/pypy/tool/nullpath.py b/rpython/tool/nullpath.py
rename from pypy/tool/nullpath.py
rename to rpython/tool/nullpath.py
diff --git a/pypy/tool/runsubprocess.py b/rpython/tool/runsubprocess.py
rename from pypy/tool/runsubprocess.py
rename to rpython/tool/runsubprocess.py
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
@@ -3,8 +3,8 @@
import sys, os
from rpython.rlib import exports
from rpython.rtyper.typesystem import getfunctionptr
-from pypy.tool import runsubprocess
-from pypy.tool.nullpath import NullPyPathLocal
+from rpython.tool import runsubprocess
+from rpython.tool.nullpath import NullPyPathLocal
from rpython.tool.udir import udir
from rpython.translator.c import gc
from rpython.translator.c.database import LowLevelDatabase
diff --git a/rpython/translator/c/test/test_genc.py
b/rpython/translator/c/test/test_genc.py
--- a/rpython/translator/c/test/test_genc.py
+++ b/rpython/translator/c/test/test_genc.py
@@ -10,7 +10,7 @@
from rpython.rtyper.lltypesystem import lltype
from rpython.rtyper.lltypesystem.lltype import *
from rpython.rtyper.lltypesystem.rstr import STR
-from pypy.tool.nullpath import NullPyPathLocal
+from rpython.tool.nullpath import NullPyPathLocal
from rpython.translator.c import genc
from rpython.translator.interactive import Translation
from rpython.translator.translator import TranslationContext, graphof
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
@@ -3,7 +3,7 @@
import py, os, sys
from rpython.tool.ansi_print import ansi_log
-from pypy.tool.runsubprocess import run_subprocess as _run_subprocess
+from rpython.tool.runsubprocess import run_subprocess as _run_subprocess
from rpython.tool.udir import udir
log = py.log.Producer("platform")
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
@@ -6,7 +6,7 @@
import sys, os, posixpath, errno, stat, time
import subprocess
-from pypy.tool.killsubprocess import killsubprocess
+from rpython.tool.killsubprocess import killsubprocess
from rpython.translator.sandbox.vfs import UID, GID
import py
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
