[pypy-svn] r25444 - in pypy/dist/pypy/objspace: . test

[auc at codespeak.net]

Author: auc
Date: Thu Apr  6 12:41:18 2006
New Revision: 25444

Modified:
   pypy/dist/pypy/objspace/logic.py
   pypy/dist/pypy/objspace/test/test_logicobjspace.py
Log:
logic objspace is translatable


Modified: pypy/dist/pypy/objspace/logic.py
==============================================================================
--- pypy/dist/pypy/objspace/logic.py	(original)
+++ pypy/dist/pypy/objspace/logic.py	Thu Apr  6 12:41:18 2006
@@ -553,7 +553,7 @@
     if not space.eq_w(w_x, w_y):
         w_d1 = w_x.getdict()
         w_d2 = w_y.getdict()
-        if (w_d1 == None) or (w_d2 == None):
+        if None in [w_d1, w_d2]:
             fail(space, w_x, w_y)
         else:
             return space.unify(w_d1, w_d2)
@@ -755,13 +755,13 @@
 
 #------ constraints -----------------
 
-from pypy.objspace.constraint import domain
+## from pypy.objspace.constraint import domain
 
-W_FiniteDomain = domain.W_FiniteDomain
+## W_FiniteDomain = domain.W_FiniteDomain
 
-def make_fd(space, w_values):
-    return domain.W_FiniteDomain(space, w_values)
-app_make_fd = gateway.interp2app(make_fd)
+## def make_fd(space, w_values):
+##     return domain.W_FiniteDomain(space, w_values)
+## app_make_fd = gateway.interp2app(make_fd)
 
 #-- THE SPACE ---------------------------------------
 
@@ -813,8 +813,8 @@
                   space.wrap(app_alias_of))
     space.setitem(space.builtin.w_dict, space.wrap('is_aliased'),
                   space.wrap(app_is_aliased))
-    space.setitem(space.builtin.w_dict, space.wrap('FiniteDomain'),
-                 space.wrap(app_make_fd))
+##     space.setitem(space.builtin.w_dict, space.wrap('FiniteDomain'),
+##                  space.wrap(app_make_fd))
     space.setitem(space.builtin.w_dict, space.wrap('bind'),
                  space.wrap(app_bind))
     space.setitem(space.builtin.w_dict, space.wrap('unify'),

Modified: pypy/dist/pypy/objspace/test/test_logicobjspace.py
==============================================================================
--- pypy/dist/pypy/objspace/test/test_logicobjspace.py	(original)
+++ pypy/dist/pypy/objspace/test/test_logicobjspace.py	Thu Apr  6 12:41:18 2006
@@ -271,22 +271,24 @@
         assert T == 45
         
     def notest_wait_two(self):
+        """this seems to trigger an
+           infinite loop in the
+           greenlet machinery
+        """
         def sleep(X, Barrier):
-            print "sleep"
             wait(X)
             bind(Barrier, True)
         
         def wait_two(X, Y):
-            print "wait two"
             Z = newvar()
             uthread(sleep, X, Z)
             uthread(sleep, Y, Z)
-            print "on barrier"
             wait(Z)
             if is_free(Y):
                 return 1
             return 2
-        
+
+        print
         X, Y = newvar(), newvar()
         disp(X)
         disp(Y)