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

[arigo at codespeak.net]

Author: arigo
Date: Mon May 26 14:53:13 2003
New Revision: 438

Modified:
   pypy/trunk/src/pypy/interpreter/interactive.py
   pypy/trunk/src/pypy/interpreter/main.py
   pypy/trunk/src/pypy/interpreter/pycode.py
Log:
made all imports relative

Modified: pypy/trunk/src/pypy/interpreter/interactive.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/interactive.py	(original)
+++ pypy/trunk/src/pypy/interpreter/interactive.py	Mon May 26 14:53:13 2003
@@ -1,6 +1,4 @@
-from pypy.interpreter import executioncontext
-from pypy.interpreter import pyframe
-from pypy.interpreter import baseobjspace
+import executioncontext, pyframe, baseobjspace
 import sys
 import code
 import linecache

Modified: pypy/trunk/src/pypy/interpreter/main.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/main.py	(original)
+++ pypy/trunk/src/pypy/interpreter/main.py	Mon May 26 14:53:13 2003
@@ -1,7 +1,6 @@
 from pypy.objspace.std import StdObjSpace
 from pypy.objspace.trivial import TrivialObjSpace
-from pypy.interpreter import executioncontext, baseobjspace
-from pypy.interpreter import pyframe
+import executioncontext, baseobjspace, pyframe
 
 import sys
 

Modified: pypy/trunk/src/pypy/interpreter/pycode.py
==============================================================================
--- pypy/trunk/src/pypy/interpreter/pycode.py	(original)
+++ pypy/trunk/src/pypy/interpreter/pycode.py	Mon May 26 14:53:13 2003
@@ -16,7 +16,7 @@
 # look at this if it makes sense
 # think of a proper base class???
 
-import baseobjspace
+import baseobjspace, pyframe
 from appfile import AppFile
 
 appfile = AppFile(__name__, ["interpreter"])
@@ -72,6 +72,7 @@
 
     def __init__(self):
         """ initialize all attributes to just something. """
+        PyBaseCode.__init__(self)
         self.co_filename = ""
         self.co_code = None
         self.co_consts = ()
@@ -98,8 +99,7 @@
             setattr(self, name, value)
 
     def eval_code(self, space, w_globals, w_locals):
-        frame = pypy.interpreter.pyframe.PyFrame(space, self,
-                                             w_globals, w_locals)
+        frame = pyframe.PyFrame(space, self, w_globals, w_locals)
         ec = space.getexecutioncontext()
         w_ret = ec.eval_frame(frame)
         return w_ret