[pypy-svn] rev 570 - pypy/trunk/src/pypy/objspace

[alex at codespeak.net]

Author: alex
Date: Tue May 27 16:08:10 2003
New Revision: 570

Modified:
   pypy/trunk/src/pypy/objspace/trivial.py
Log:
some further fixes



Modified: pypy/trunk/src/pypy/objspace/trivial.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/trivial.py	(original)
+++ pypy/trunk/src/pypy/objspace/trivial.py	Tue May 27 16:08:10 2003
@@ -13,7 +13,6 @@
 
     def initialize(self):
         import __builtin__, types
-        self.builtin = __builtin__
         self.w_builtins.update(__builtin__.__dict__)
         for n, c in self.w_builtins.iteritems():
             if isinstance(c, types.ClassType) and issubclass(c, Exception):
@@ -21,7 +20,8 @@
         self.w_None = None
         self.w_True = True
         self.w_False = False
-        self.w_sys = sys
+        self.make_builtins()
+        self.make_sys()
 
     # general stuff
     def wrap(self, x):
@@ -172,9 +172,9 @@
             raise NoValue
 
     def newfunction(self, code, globals, defaultarguments, closure=None):
-        assert hasattr(code.co_name)
-        assert hasattr(code.build_arguments)
-        assert hasattr(code.eval_code)
+        assert hasattr(code, co_name)
+        assert hasattr(code, build_arguments)
+        assert hasattr(code, eval_code)
         class nufun(object):
             def __init__(self, space, code, globals, defaultarguments, closure):
                 self.space = space