[pypy-svn] rev 523 - pypy/trunk/src/pypy/interpreter

[tismer at codespeak.net]

Author: tismer
Date: Tue May 27 12:40:20 2003
New Revision: 523

Modified:
   pypy/trunk/src/pypy/interpreter/interactive.py
   pypy/trunk/src/pypy/interpreter/opcode.py
   pypy/trunk/src/pypy/interpreter/pyframe.py
Log:
modified several imports to make interactive.py work with std

Modified: pypy/trunk/src/pypy/interpreter/interactive.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/interactive.py	(original)
+++ pypy/trunk/src/pypy/interpreter/interactive.py	Tue May 27 12:40:20 2003
@@ -1,4 +1,4 @@
-import executioncontext, pyframe, baseobjspace
+from pypy.interpreter import executioncontext, pyframe, baseobjspace
 import sys
 import code
 import linecache

Modified: pypy/trunk/src/pypy/interpreter/opcode.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/opcode.py	(original)
+++ pypy/trunk/src/pypy/interpreter/opcode.py	Tue May 27 12:40:20 2003
@@ -1,6 +1,7 @@
-import dis, pyframe, baseobjspace
 from appfile import AppFile
-from baseobjspace import OperationError, NoValue
+from pypy.interpreter.baseobjspace import OperationError, NoValue
+import dis
+from pypy.interpreter import pyframe, baseobjspace
 
 
 # dynamically loaded application-space utilities

Modified: pypy/trunk/src/pypy/interpreter/pyframe.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/pyframe.py	(original)
+++ pypy/trunk/src/pypy/interpreter/pyframe.py	Tue May 27 12:40:20 2003
@@ -1,13 +1,8 @@
 """ PyFrame class implementation with the interpreter main loop.
 """
-import opcode
-# XXX this is probably a Python bug:
-# circular import doesn't work if we spell this
-# from pypy.interpreter import opcode
-# report this to python-dev
-from executioncontext import OperationError, Stack
-import baseobjspace
-from appfile import AppFile
+
+from pypy.interpreter.executioncontext import OperationError, Stack
+from pypy.interpreter.appfile import AppFile
 
 appfile = AppFile(__name__, ["interpreter"])
 
@@ -37,6 +32,7 @@
 
     def eval(self, executioncontext):
         "Interpreter main loop!"
+        from pypy.interpreter import opcode
         try:
             while True:
                 try: