Make absolutely sure that ConflictError cannot be raised during

abort when using the ``SerialConflictHandler`` conflict handlers.

CHANGES.txt

@@ -20,6 +20,9 @@ CHANGES
   into a set of trivial values that cannot have complex references. (You
   should rarely need this feature.)
 
+- Bug: Make absolutely sure that ``ConflictError`` cannot be raised during
+  abort when using the ``SerialConflictHandler`` conflict handlers.
+
 - Bug: Fix circular reference detection of non-persistent object that were
   different instances but equated.
 

src/mongopersist/conflict.py

@@ -121,7 +121,13 @@ def check_conflict(self, obj):
 
     def has_conflicts(self, objs):
         for obj in objs:
-            if self.check_conflict(obj) is not None:
+            try:
+                if self.check_conflict(obj) is not None:
+                    return True
+            except interfaces.ConflictError, err:
+                # In some cases even trying to resolve the conflict causes a
+                # conflict error, so we need to catch the error here to avoid
+                # infinite recursion.
                 return True
         return False