[pypy-svn] r4856 - in pypy/branch/src-newobjectmodel/pypy: interpreter objspace

[arigo at codespeak.net]

Author: arigo
Date: Thu Jun  3 11:49:42 2004
New Revision: 4856

Modified:
   pypy/branch/src-newobjectmodel/pypy/interpreter/pyframe.py
   pypy/branch/src-newobjectmodel/pypy/objspace/trivial.py
Log:
Everything is fine apart from the tests.


Modified: pypy/branch/src-newobjectmodel/pypy/interpreter/pyframe.py
==============================================================================
--- pypy/branch/src-newobjectmodel/pypy/interpreter/pyframe.py	(original)
+++ pypy/branch/src-newobjectmodel/pypy/interpreter/pyframe.py	Thu Jun  3 11:49:42 2004
@@ -51,6 +51,7 @@
                     except OperationError, e:
                         pytraceback.record_application_traceback(
                             self.space, e, self, last_instr)
+                        executioncontext.exception_trace(e)
                         # convert an OperationError into a control flow
                         # exception
                         import sys
@@ -250,7 +251,6 @@
     def action(self, frame, last_instr, executioncontext):
         e = self.args[0]
         frame.last_exception = e
-        executioncontext.exception_trace(e)
 
         ControlFlowException.action(self, frame,
                                     last_instr, executioncontext)

Modified: pypy/branch/src-newobjectmodel/pypy/objspace/trivial.py
==============================================================================
--- pypy/branch/src-newobjectmodel/pypy/objspace/trivial.py	(original)
+++ pypy/branch/src-newobjectmodel/pypy/objspace/trivial.py	Thu Jun  3 11:49:42 2004
@@ -65,12 +65,13 @@
         return done
 
     def initialize(self):
-        from pypy.interpreter.typedef import TypeDef
+        from pypy.interpreter.typedef import TypeDef, GetSetProperty
 
         self.object_typedef = TypeDef('object', 
             __getattribute__ = gateway.interp2app(Object.descr__getattribute__.im_func),
             __str__ = gateway.interp2app(lambda space, w_x: str(w_x)),
             __repr__ = gateway.interp2app(lambda space, w_x: repr(w_x)),
+            __class__ = GetSetProperty(self.__class__.type),
             )
  
         self.w_None = None