[pypy-svn] r34673 - pypy/dist/pypy/objspace

[auc at codespeak.net]

Author: auc
Date: Thu Nov 16 15:48:14 2006
New Revision: 34673

Modified:
   pypy/dist/pypy/objspace/logic.py
Log:
fix typeorders


Modified: pypy/dist/pypy/objspace/logic.py
==============================================================================
--- pypy/dist/pypy/objspace/logic.py	(original)
+++ pypy/dist/pypy/objspace/logic.py	Thu Nov 16 15:48:14 2006
@@ -187,13 +187,10 @@
 
     # multimethods hack
     space.model.typeorder[W_Var] = [(W_Var, None), (W_Root, None)] # None means no conversion
-    space.model.typeorder[W_Future] = [(W_Future, None), (W_Var, None)]
-    space.model.typeorder[W_CVar] = [(W_CVar, None), (W_Var, None)]
-    space.model.typeorder[W_CSpace] = [(W_CSpace, None), (baseobjspace.Wrappable, None)]
-    space.model.typeorder[W_ThreadGroupScheduler] = [(W_ThreadGroupScheduler, None), (W_CSpace, None)]
+    space.model.typeorder[W_Future] = [(W_Future, None), (W_Var, None), (W_Root, None)]
+    space.model.typeorder[W_CVar] = [(W_CVar, None), (W_Var, None), (W_Root, None)]
     space.model.typeorder[W_FiniteDomain] = [(W_FiniteDomain, None), (W_Root, None)] 
 
-
     for name in all_mms.keys():
         exprargs, expr, miniglobals, fallback = (
             all_mms[name].install_not_sliced(space.model.typeorder, baked_perform_call=False))