[pypy-svn] r60932 - pypy/trunk/pypy/objspace/std

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Jan 13 18:07:45 2009
New Revision: 60932

Modified:
   pypy/trunk/pypy/objspace/std/typeobject.py
Log:
tiny cleanup in the C3 algo


Modified: pypy/trunk/pypy/objspace/std/typeobject.py
==============================================================================
--- pypy/trunk/pypy/objspace/std/typeobject.py	(original)
+++ pypy/trunk/pypy/objspace/std/typeobject.py	Tue Jan 13 18:07:45 2009
@@ -688,26 +688,25 @@
     while orderlists:
         for candidatelist in orderlists:
             candidate = candidatelist[0]
-            if mro_blockinglist(candidate, orderlists) is GOODCANDIDATE:
+            if mro_blockinglist(candidate, orderlists) is None:
                 break    # good candidate
         else:
             return mro_error(space, orderlists)  # no candidate found
         assert candidate not in order
         order.append(candidate)
         for i in range(len(orderlists)-1, -1, -1):
-            if orderlists[i][0] == candidate:
+            if orderlists[i][0] is candidate:
                 del orderlists[i][0]
                 if len(orderlists[i]) == 0:
                     del orderlists[i]
     return order
 
-GOODCANDIDATE = []
 
 def mro_blockinglist(candidate, orderlists):
     for lst in orderlists:
         if candidate in lst[1:]:
             return lst
-    return GOODCANDIDATE # good candidate
+    return None # good candidate
 
 def mro_error(space, orderlists):
     cycle = []