[pypy-svn] r12466 - in pypy/dist/pypy: bin interpreter tool

[arigo at codespeak.net]

Author: arigo
Date: Wed May 18 19:54:10 2005
New Revision: 12466

Removed:
   pypy/dist/pypy/tool/getpy.py
Modified:
   pypy/dist/pypy/bin/py.py
   pypy/dist/pypy/interpreter/baseobjspace.py
   pypy/dist/pypy/interpreter/gateway.py
Log:
Can remove tool/getpy.py now.


Modified: pypy/dist/pypy/bin/py.py
==============================================================================
--- pypy/dist/pypy/bin/py.py	(original)
+++ pypy/dist/pypy/bin/py.py	Wed May 18 19:54:10 2005
@@ -11,9 +11,6 @@
 except ImportError:
     pass
 
-from pypy.tool.getpy import py
-#py.magic.invoke(compile=1)
-
 from pypy.tool import option
 from pypy.tool.optik import make_option
 from pypy.interpreter import main, interactive, error

Modified: pypy/dist/pypy/interpreter/baseobjspace.py
==============================================================================
--- pypy/dist/pypy/interpreter/baseobjspace.py	(original)
+++ pypy/dist/pypy/interpreter/baseobjspace.py	Wed May 18 19:54:10 2005
@@ -387,7 +387,7 @@
         space = cache.space
         # XXX will change once we have our own compiler 
         from pypy.interpreter.pycode import PyCode
-        from pypy.tool.getpy import py  # aehem
+        import py
         source = source.lstrip()
         assert source.startswith('('), "incorrect header in:\n%s" % (source,)
         source = py.code.Source("def anonymous%s\n" % source)

Modified: pypy/dist/pypy/interpreter/gateway.py
==============================================================================
--- pypy/dist/pypy/interpreter/gateway.py	(original)
+++ pypy/dist/pypy/interpreter/gateway.py	Wed May 18 19:54:10 2005
@@ -22,7 +22,7 @@
 from pypy.tool.sourcetools import NiceCompile
 
 # internal non-translatable parts: 
-from pypy.tool.getpy import py  # XXX from interpreter/ we get py.py 
+import py
 
 class Signature:
     "NOT_RPYTHON"
@@ -639,7 +639,6 @@
 
     def _setup(cls):
         """NOT_RPYTHON"""
-        from pypy.tool.getpy import py
         lp = py.path.local
         import pypy, os
         p = lp(pypy.__file__).new(basename='_cache').ensure(dir=1)
@@ -679,7 +678,7 @@
 # self-destruct on double-click:
 def harakiri():
     import pypy._cache as _c
-    from pypy.tool.getpy import py
+    import py
     lp = py.path.local
     for pth in lp(_c.__file__).dirpath().listdir():
         try:

Deleted: /pypy/dist/pypy/tool/getpy.py
==============================================================================
--- /pypy/dist/pypy/tool/getpy.py	Wed May 18 19:54:10 2005
+++ (empty file)
@@ -1 +0,0 @@
-import py