[pypy-svn] r39220 - in pypy/dist/pypy: module/_cslib rlib/cslib rlib/cslib/test

[auc at codespeak.net]

Author: auc
Date: Tue Feb 20 09:33:36 2007
New Revision: 39220

Modified:
   pypy/dist/pypy/module/_cslib/fd.py
   pypy/dist/pypy/module/_cslib/propagation.py
   pypy/dist/pypy/rlib/cslib/rconstraint.py
   pypy/dist/pypy/rlib/cslib/rpropagation.py
   pypy/dist/pypy/rlib/cslib/test/test_cslib.py
Log:
oops


Modified: pypy/dist/pypy/module/_cslib/fd.py
==============================================================================
--- pypy/dist/pypy/module/_cslib/fd.py	(original)
+++ pypy/dist/pypy/module/_cslib/fd.py	Tue Feb 20 09:33:36 2007
@@ -6,7 +6,7 @@
 from pypy.objspace.std.listobject import W_ListObject, W_TupleObject
 from pypy.objspace.std.intobject import W_IntObject
 
-from pypy.rlib import rdomain as rd
+from pypy.rlib.cslib import rdomain as rd
 
 class _FiniteDomain(rd.BaseFiniteDomain):
     """

Modified: pypy/dist/pypy/module/_cslib/propagation.py
==============================================================================
--- pypy/dist/pypy/module/_cslib/propagation.py	(original)
+++ pypy/dist/pypy/module/_cslib/propagation.py	Tue Feb 20 09:33:36 2007
@@ -1,5 +1,6 @@
-from pypy.rlib.rpropagation import Repository, Solver
-import pypy.rlib.rdistributor as rd
+from pypy.rlib.cslib.rpropagation import Repository, Solver
+import pypy.rlib.cslib.rdistributor as rd
+
 from pypy.module._cslib import fd
 from pypy.module._cslib.constraint import W_AbstractConstraint
 
@@ -8,7 +9,6 @@
 from pypy.interpreter import typedef, gateway, baseobjspace
 from pypy.interpreter.gateway import interp2app
 
-#from pypy.objspace.std.listobject import W_ListObject, W_TupleObject
 from pypy.objspace.std.intobject import W_IntObject
 from pypy.objspace.std.listobject import W_ListObject
 from pypy.objspace.std.tupleobject import W_TupleObject

Modified: pypy/dist/pypy/rlib/cslib/rconstraint.py
==============================================================================
--- pypy/dist/pypy/rlib/cslib/rconstraint.py	(original)
+++ pypy/dist/pypy/rlib/cslib/rconstraint.py	Tue Feb 20 09:33:36 2007
@@ -1,5 +1,5 @@
-from pypy.rlib.btree import BTreeNode
-from pypy.rlib.rdomain import BaseFiniteDomain, ConsistencyError
+from pypy.rlib.cslib.btree import BTreeNode
+from pypy.rlib.cslib.rdomain import BaseFiniteDomain, ConsistencyError
 
 
 class AbstractConstraint:

Modified: pypy/dist/pypy/rlib/cslib/rpropagation.py
==============================================================================
--- pypy/dist/pypy/rlib/cslib/rpropagation.py	(original)
+++ pypy/dist/pypy/rlib/cslib/rpropagation.py	Tue Feb 20 09:33:36 2007
@@ -1,5 +1,5 @@
 """The code of the constraint propagation algorithms"""
-from pypy.rlib.rconstraint import AbstractConstraint, ConsistencyError
+from pypy.rlib.cslib.rconstraint import AbstractConstraint, ConsistencyError
 
 class Repository:
     """Stores variables, domains and constraints

Modified: pypy/dist/pypy/rlib/cslib/test/test_cslib.py
==============================================================================
--- pypy/dist/pypy/rlib/cslib/test/test_cslib.py	(original)
+++ pypy/dist/pypy/rlib/cslib/test/test_cslib.py	Tue Feb 20 09:33:36 2007
@@ -1,7 +1,7 @@
 import os
 
-from pypy.rlib import rconstraint as rc, rdomain as rd
-from pypy.rlib import rpropagation as rp, rdistributor as rdist
+from pypy.rlib.cslib import rconstraint as rc, rdomain as rd
+from pypy.rlib.cslib import rpropagation as rp, rdistributor as rdist
 
 
 def debug(msg):