Don't compare strings with 'is not'. (Broke things in pypy.) Also show Struct members in sorted order so doctests work in pypy.

darius · darius · commit 081f6faada8d · 2011-10-28T23:45:37.000Z
diff --git a/learning.py b/learning.py
@@ -83,7 +83,7 @@ def setproblem(self, target, inputs=None, exclude=()):
             self.inputs = removeall(self.target, inputs)
         else:
             self.inputs = [a for a in self.attrs
-                           if a is not self.target and a not in exclude]
+                           if a != self.target and a not in exclude]
         if not self.values:
             self.values = map(unique, zip(*self.examples))
         self.check_me()
@@ -137,7 +137,7 @@ def parse_csv(input, delim=','):
     >>> parse_csv('1, 2, 3 \n 0, 2, na')
     [[1, 2, 3], [0, 2, 'na']]
     """
-    lines = [line for line in input.splitlines() if line.strip() is not '']
+    lines = [line for line in input.splitlines() if line.strip()]
     return [map(num_or_str, line.split(delim)) for line in lines]
 
 #______________________________________________________________________________
diff --git a/search.py b/search.py
@@ -204,7 +204,7 @@ def iterative_deepening_search(problem):
     "[Fig. 3.18]"
     for depth in xrange(sys.maxint):
         result = depth_limited_search(problem, depth)
-        if result is not 'cutoff':
+        if result != 'cutoff':
             return result
 
 #______________________________________________________________________________
diff --git a/utils.py b/utils.py
@@ -260,7 +260,7 @@ def __cmp__(self, other):
 
     def __repr__(self):
         args = ['%s=%s' % (k, repr(v)) for (k, v) in vars(self).items()]
-        return 'Struct(%s)' % ', '.join(args)
+        return 'Struct(%s)' % ', '.join(sorted(args))
 
 def update(x, **entries):
     """Update a dict; or an object with slots; according to entries.
