Skip to content

Z
zodb
Commit bf188f4a authored by Adam Groszer's avatar Adam Groszer
Browse files
Options

fix except for py3

parent fdfd53cd
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
src/ZODB/ConflictResolution.py
View file @ bf188f4a
...@@ -294,7 +294,7 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle, ...@@ -294,7 +294,7 @@ def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle,
pickler.dump(meta) pickler.dump(meta)
pickler.dump(resolved) pickler.dump(resolved)
return self._crs_transform_record_data(file.getvalue()) return self._crs_transform_record_data(file.getvalue())
except (ConflictError, BadClassName), e: except (ConflictError, BadClassName) as e:
logger.exception(str(e)) logger.exception(str(e))
except: except:
# If anything else went wrong, catch it here and avoid passing an # 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7