[pypy-commit] pypy split-rpython: Renamed pypy_interact to pypy.sandbox.pypysandbox. Removed pypydir import from cbuild

[Aquana]

Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: split-rpython
Changeset: r59826:dbc4e7b736ec
Date: 2013-01-06 21:30 +0100
http://bitbucket.org/pypy/pypy/changeset/dbc4e7b736ec/

Log:	Renamed pypy_interact to pypy.sandbox.pypysandbox. Removed pypydir
	import from cbuild

diff --git a/pypy/bin/pypysandbox b/pypy/bin/pypysandbox
new file mode 100644
--- /dev/null
+++ b/pypy/bin/pypysandbox
@@ -0,0 +1,5 @@
+#!/usr/bin/env pypy
+
+from pypy.sandbox import pypysandbox
+
+pypysandbox.main()
\ No newline at end of file
diff --git a/pypy/sandbox/__init__.py b/pypy/sandbox/__init__.py
new file mode 100644
--- /dev/null
+++ b/pypy/sandbox/__init__.py
@@ -0,0 +1,1 @@
+# empty
\ No newline at end of file
diff --git a/rpython/translator/sandbox/pypy_interact.py b/pypy/sandbox/pypysandbox.py
rename from rpython/translator/sandbox/pypy_interact.py
rename to pypy/sandbox/pypysandbox.py
--- a/rpython/translator/sandbox/pypy_interact.py
+++ b/pypy/sandbox/pypysandbox.py
@@ -64,8 +64,7 @@
              'tmp': tmpdirnode,
              })
 
-
-if __name__ == '__main__':
+def main():
     from getopt import getopt      # and not gnu_getopt!
     options, arguments = getopt(sys.argv[1:], 't:hv', 
                                 ['tmp=', 'heapsize=', 'timeout=', 'log=',
@@ -125,3 +124,6 @@
         sandproc.interact()
     finally:
         sandproc.kill()
+
+if __name__ == '__main__':
+    main()
\ No newline at end of file
diff --git a/rpython/translator/sandbox/test/test_pypy_interact.py b/pypy/sandbox/test/test_pypysandbox.py
rename from rpython/translator/sandbox/test/test_pypy_interact.py
rename to pypy/sandbox/test/test_pypysandbox.py
--- a/rpython/translator/sandbox/test/test_pypy_interact.py
+++ b/pypy/sandbox/test/test_pypysandbox.py
@@ -1,5 +1,5 @@
 import os, sys, stat, errno
-from rpython.translator.sandbox.pypy_interact import PyPySandboxedProc
+from pypy.sandbox.pypysandbox import PyPySandboxedProc
 from rpython.translator.interactive import Translation
 
 from pypy.module.sys.version import CPYTHON_VERSION
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
@@ -1,7 +1,6 @@
 import py
 import sys
 
-from pypy.conftest import pypydir
 from rpython.translator.platform import host
 from rpython.tool.udir import udir