Raise DuplicateKeyError for commands PYTHON-507

Only when appropriate. The findAndModify command
can return duplicate key error when doing an upsert.

Author: behackett

pymongo/helpers.py

@@ -23,6 +23,7 @@
 from bson.binary import OLD_UUID_SUBTYPE
 from bson.son import SON
 from pymongo.errors import (AutoReconnect,
+                            DuplicateKeyError,
                             OperationFailure,
                             TimeoutError)
 
@@ -139,7 +140,11 @@ def _check_command_response(response, reset, msg="%s", allowable_errors=[]):
                     ex_msg += (", assertionCode: %d" %
                                (details["assertionCode"],))
                 raise OperationFailure(ex_msg, details.get("assertionCode"))
-            raise OperationFailure(msg % errmsg)
+            code = details.get("code")
+            # findAndModify with upsert can raise duplicate key error
+            if code in (11000, 11001, 12582):
+                raise DuplicateKeyError(errmsg, code)
+            raise OperationFailure(msg % errmsg, code)
 
 
 def _fields_list_to_dict(fields):

pymongo/mongo_client.py

@@ -855,8 +855,8 @@ def __check_response_to_last_error(self, response):
                     break
 
         if "code" in details:
-            if details["code"] in [11000, 11001, 12582]:
-                raise DuplicateKeyError(details["err"])
+            if details["code"] in (11000, 11001, 12582):
+                raise DuplicateKeyError(details["err"], details["code"])
             else:
                 raise OperationFailure(details["err"], details["code"])
         else:

pymongo/mongo_replica_set_client.py

@@ -1073,8 +1073,8 @@ def __check_response_to_last_error(self, response):
             raise AutoReconnect(error_msg)
 
         if "code" in error:
-            if error["code"] in [11000, 11001, 12582]:
-                raise DuplicateKeyError(error["err"])
+            if error["code"] in (11000, 11001, 12582):
+                raise DuplicateKeyError(error["err"], error["code"])
             else:
                 raise OperationFailure(error["err"], error["code"])
         else:

test/test_collection.py

@@ -1700,6 +1700,14 @@ def test_find_and_modify(self):
         c.drop()
         c.insert({'_id': 1, 'i': 1})
 
+        # Test that we raise DuplicateKeyError when appropriate.
+        c.ensure_index('i', unique=True)
+        self.assertRaises(DuplicateKeyError,
+                          c.find_and_modify, query={'i': 1, 'j': 1},
+                          update={'$set': {'k': 1}}, upsert=True)
+        c.drop_indexes()
+
+        # Test correct findAndModify
         self.assertEqual({'_id': 1, 'i': 1},
                          c.find_and_modify({'_id': 1}, {'$inc': {'i': 1}}))
         self.assertEqual({'_id': 1, 'i': 3},