Commit 1ef0dd8a authored by Chris McDonough's avatar Chris McDonough

Had an incorrect index into the class_tuple in bad_class. :-(

parent b7dc9176
...@@ -92,7 +92,7 @@ from ZODB.POSException import ConflictError ...@@ -92,7 +92,7 @@ from ZODB.POSException import ConflictError
bad_classes={} bad_classes={}
def bad_class(class_tuple): 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 # if we've seen the class before or if it's a ZClass, we know that
# we can't resolve the conflict # we can't resolve the conflict
return 1 return 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment