Commit bf188f4a authored by Adam Groszer's avatar Adam Groszer

fix except for py3

parent fdfd53cd
......@@ -294,7 +294,7 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
pickler.dump(meta)
pickler.dump(resolved)
return self._crs_transform_record_data(file.getvalue())
except (ConflictError, BadClassName), e:
except (ConflictError, BadClassName) as e:
logger.exception(str(e))
except:
# If anything else went wrong, catch it here and avoid passing an
......
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