fix except for py3

zopefoundation · Feb 12, 2015 · bf188f4 · bf188f4
1 parent fdfd53c
commit bf188f4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/ZODB/ConflictResolution.py b/src/ZODB/ConflictResolution.py
@@ -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