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

[ale at codespeak.net]

Author: ale
Date: Thu Jun 15 09:51:20 2006
New Revision: 28799

Modified:
   pypy/dist/pypy/objspace/logic.py
Log:
Change to accomodate the new stackless setup

Modified: pypy/dist/pypy/objspace/logic.py
==============================================================================
--- pypy/dist/pypy/objspace/logic.py	(original)
+++ pypy/dist/pypy/objspace/logic.py	Thu Jun 15 09:51:20 2006
@@ -36,7 +36,7 @@
     return False
 
 if USE_COROUTINES:
-    from pypy.module.stackless.interp_coroutine import Coroutine, AbstractThunk
+    from pypy.module._stackless.interp_coroutine import Coroutine, AbstractThunk
 
     class ScheduleState(object):
         def __init__(self):
@@ -768,8 +768,8 @@
 W_ComputationSpace = computationspace.W_ComputationSpace
 
 # ---- constraints ----------------
-from pypy.objspace.constraint import constraint
-all_mms.update(constraint.all_mms)
+#from pypy.objspace.constraint import constraint
+#all_mms.update(constraint.all_mms)
 
 #----- distributors ---------------
 from pypy.objspace.constraint import distributor
@@ -836,10 +836,10 @@
     space.setitem(space.builtin.w_dict, space.wrap('intersection'),
                  space.wrap(domain.app_intersection))
     #-- contraint ----
-    space.setitem(space.builtin.w_dict, space.wrap('make_expression'),
-                 space.wrap(constraint.app_make_expression))
-    space.setitem(space.builtin.w_dict, space.wrap('AllDistinct'),
-                 space.wrap(constraint.app_make_alldistinct))
+#    space.setitem(space.builtin.w_dict, space.wrap('make_expression'),
+#                 space.wrap(constraint.app_make_expression))
+#    space.setitem(space.builtin.w_dict, space.wrap('AllDistinct'),
+#                 space.wrap(constraint.app_make_alldistinct))
     #-- distributor --
     space.setitem(space.builtin.w_dict, space.wrap('NaiveDistributor'),
                  space.wrap(distributor.app_make_naive_distributor))