return the entire response to lastError for update/remove if safe is True PYTHON-87

Author: Mike Dirolf

pymongo/collection.py

@@ -239,8 +239,8 @@ def update(self, spec, document,
  >>> list(db.test.find())
  [{u'a': u'c', u'x': u'y', u'_id': ObjectId('...')}]
 
- If `safe` is ``True`` returns the number of documents affected
- by the :meth:`update`. Otherwise, returns ``None``.
+ If `safe` is ``True`` returns the response to the *lastError*
+ command. Otherwise, returns ``None``.
 
  :Parameters:
  - `spec`: a ``dict`` or :class:`~pymongo.son.SON` instance specifying
@@ -259,7 +259,7 @@ def update(self, spec, document,
  for that change.
 
  .. versionchanged:: 1.3+
- Return the number of updated documents if `safe` is ``True``.
+ Return the response to *lastError* if `safe` is ``True``.
  .. versionadded:: 1.1.1
  The `multi` parameter.
 
@@ -298,8 +298,8 @@ def remove(self, spec_or_object_id=None, safe=False):
  :meth:`~pymongo.database.Database.drop_collection`, however, as
  indexes will not be removed.
 
- If `safe` is ``True`` returns the number of documents affected
- by the :meth:`remove`. Otherwise, returns ``None``.
+ If `safe` is ``True`` returns the response to the *lastError*
+ command. Otherwise, returns ``None``.
 
  :Parameters:
  - `spec_or_object_id` (optional): a ``dict`` or
@@ -310,7 +310,7 @@ def remove(self, spec_or_object_id=None, safe=False):
  - `safe` (optional): check that the remove succeeded?
 
  .. versionchanged:: 1.3+
- Return the number of removed documents if `safe` is ``True``.
+ Return the response to *lastError* if `safe` is ``True``.
  .. versionchanged:: 1.2
  The `spec_or_object_id` parameter is now optional. If it is
  not specified *all* documents in the collection will be

pymongo/connection.py

@@ -430,8 +430,7 @@ def __check_response_to_last_error(self, response):
  `response` is a byte string representing a response to the message.
  If it represents an error response we raise OperationFailure.
 
- Return the value of ``'n'`` from the response (the number of
- documents affected by the command).
+ Return the response as a document.
  """
  response = helpers._unpack_response(response)
 
@@ -440,7 +439,7 @@ def __check_response_to_last_error(self, response):
 
  # TODO unify logic with database.error method
  if error.get("err", 0) is None:
- return error["n"]
+ return error
  if error["err"] == "not master":
  self._reset()
 
@@ -449,15 +448,15 @@ def __check_response_to_last_error(self, response):
  else:
  raise OperationFailure(error["err"])
 
- return error["n"]
+ return error
 
  def _send_message(self, message, with_last_error=False):
  """Say something to Mongo.
 
  Raises ConnectionFailure if the message cannot be sent. Raises
  OperationFailure if `with_last_error` is ``True`` and the
  response to the getLastError call returns an error. Return the
- number of affected documents, or ``None`` if `with_last_error`
+ response from lastError, or ``None`` if `with_last_error`
  is ``False``.
 
  :Parameters:

test/test_collection.py

@@ -546,7 +546,7 @@ def test_multi_update(self):
  self.assertEqual(5, doc["y"])
 
  self.assertEqual(2, db.test.update({"x": 4}, {"$set": {"y": 6}},
- multi=True, safe=True))
+ multi=True, safe=True)["n"])
 
  def test_upsert(self):
  db = self.db
@@ -577,8 +577,9 @@ def test_safe_update(self):
  self.assertRaises(OperationFailure, db.test.update,
  {"_id": id}, {"$inc": {"x": 1}}, safe=True)
 
- self.assertEqual(1, db.test.update({"_id": id}, {"$inc": {"x": 2}}, safe=True))
- self.assertEqual(0, db.test.update({"_id": "foo"}, {"$inc": {"x": 2}}, safe=True))
+ self.assertEqual(1, db.test.update({"_id": id}, {"$inc": {"x": 2}}, safe=True)["n"])
+
+ self.assertEqual(0, db.test.update({"_id": "foo"}, {"$inc": {"x": 2}}, safe=True)["n"])
 
  def test_safe_save(self):
  db = self.db
@@ -610,8 +611,8 @@ def test_safe_remove(self):
  db.drop_collection("test")
  db.test.insert({"x": 1})
  db.test.insert({"x": 1})
- self.assertEqual(2, db.test.remove({}, safe=True))
- self.assertEqual(0, db.test.remove({}, safe=True))
+ self.assertEqual(2, db.test.remove({}, safe=True)["n"])
+ self.assertEqual(0, db.test.remove({}, safe=True)["n"])
 
  def test_count(self):
  db = self.db