Made doctests work in Python 2.4. Not sure it'll keep being worth it, but these changes were minor.

darius · darius · commit 19e7acf266ac · 2011-10-09T22:32:58.000Z
diff --git a/csp.py b/csp.py
@@ -102,7 +102,8 @@ def support_pruning(self):
         """Make sure we can prune values from domains. (We want to pay
         for this only if we use it.)"""
         if self.curr_domains is None:
-            self.curr_domains = dict((v, self.domains[v][:]) for v in self.vars)
+            self.curr_domains = dict((v, list(self.domains[v]))
+                                     for v in self.vars)
 
     def suppose(self, var, value):
         "Start accumulating inferences from assuming var=value."
@@ -498,7 +499,7 @@ def __init__(self, grid):
         the digits 1-9 denote a filled cell, '.' or '0' an empty one;
         other characters are ignored."""
         squares = iter(re.findall(r'\d|\.', grid))
-        domains = dict((var, [int(ch)] if ch in '123456789' else range(1, 10))
+        domains = dict((var, if_(ch in '123456789', [ch], '123456789'))
                        for var, ch in zip(flatten(self.rows), squares))
         for _ in squares:
             raise ValueError("Not a Sudoku grid", grid) # Too many squares
diff --git a/logic.py b/logic.py
@@ -296,7 +296,7 @@ def is_definite_clause(s):
     elif s.op == '>>':
         antecedent, consequent = s.args
         return (is_symbol(consequent.op)
-                and all(is_symbol(arg.op) for arg in conjuncts(antecedent)))
+                and every(lambda arg: is_symbol(arg.op), conjuncts(antecedent)))
     else:
         return False
 
@@ -828,8 +828,7 @@ def occur_check(var, x, s):
         return (occur_check(var, x.op, s) or
                 occur_check(var, x.args, s))
     elif isinstance(x, (list, tuple)):
-        return any(occur_check(var, element, s)
-                   for element in x)
+        return some(lambda element: occur_check(var, element, s), x)
     else:
         return False
 
diff --git a/probability.py b/probability.py
@@ -174,7 +174,8 @@ def __init__(self, table):
         if isinstance(table, (float, int)): # no parents, 0-tuple
             self.table = {(): table}
         elif isinstance(table, dict):
-            key = table.keys()[0] if table else None
+            if table: key = table.keys()[0]
+            else: key = None
             if isinstance(key, bool):       # one parent, 1-tuple
                 self.table = dict(((k,), v) for k, v in table.items())
             elif isinstance(key, tuple):    # normal case, n-tuple
