Commit a1b5e3b5 authored by Jeremy Hylton's avatar Jeremy Hylton

Exit early if load_class() fails.

parent 3fd738f7
......@@ -95,6 +95,8 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
return None
newstate = unpickler.load()
klass = load_class(class_tuple)
if klass is None:
return None
inst = klass.__basicnew__()
try:
......
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