[Zodb-checkins] CVS: Zope/lib/python/ZODB - ConflictResolution.py:1.5.10.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv8834

Modified Files:
      Tag: Zope-2_4-branch
	ConflictResolution.py 
Log Message:
Had a bad index into the class_tuple in bad_class.  :-(


=== Zope/lib/python/ZODB/ConflictResolution.py 1.5.10.1 => 1.5.10.2 ===
 bad_classes={}
 def bad_class(class_tuple):
-    if bad_classes.has_key(class_tuple) or class_tuple[0][1] == '*':
+    if bad_classes.has_key(class_tuple) or class_tuple[0][0] == '*':
         # if we've seen the class before or if it's a ZClass, we know that
         # we can't resolve the conflict
         return 1