[pypy-svn] r49862 - pypy/dist/pypy/objspace/std

[arigo at codespeak.net]

Author: arigo
Date: Mon Dec 17 10:29:24 2007
New Revision: 49862

Modified:
   pypy/dist/pypy/objspace/std/objspace.py
Log:
Fix nonsensical inheritence from flowcontext.PyFrame.
This killed the CALL_METHOD optimization entirely!


Modified: pypy/dist/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/std/objspace.py	(original)
+++ pypy/dist/pypy/objspace/std/objspace.py	Mon Dec 17 10:29:24 2007
@@ -16,7 +16,6 @@
 from pypy.rlib.rarithmetic import base_int
 from pypy.rlib.objectmodel import we_are_translated
 from pypy.rlib.jit import hint, we_are_jitted
-from pypy.objspace.flow.flowcontext import PyFrame as FlowPyFrame
 import sys
 import os
 import __builtin__
@@ -59,7 +58,7 @@
         # Import all the object types and implementations
         self.model = StdTypeModel(self.config)
 
-        class StdObjSpaceFrame(FlowPyFrame):
+        class StdObjSpaceFrame(pyframe.PyFrame):
             if self.config.objspace.std.optimized_int_add:
                 if self.config.objspace.std.withsmallint:
                     def BINARY_ADD(f, oparg, *ignored):